diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-09 09:27:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 09:27:43 -0700 |
| commit | 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0 (patch) | |
| tree | 4d2814b43911594cf054a9c4613baf55f6e5b7a4 /archive-tar.c | |
| parent | be427d758b53343d31debb520c0bc251a62013a9 (diff) | |
| parent | ec00d6e0038e030cf73182374e21025c2776cb23 (diff) | |
| download | git-6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning
Diffstat (limited to 'archive-tar.c')
| -rw-r--r-- | archive-tar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archive-tar.c b/archive-tar.c index ba890ebdec..cee06ce3cb 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -180,7 +180,7 @@ static int write_tar_entry(struct archiver_args *args, sprintf(header.mode, "%07o", mode & 07777); sprintf(header.size, "%011lo", S_ISREG(mode) ? size : 0); - sprintf(header.mtime, "%011lo", args->time); + sprintf(header.mtime, "%011lo", (unsigned long) args->time); sprintf(header.uid, "%07o", 0); sprintf(header.gid, "%07o", 0); |