diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-08-26 17:08:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-26 17:08:19 -0700 |
commit | 0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08 (patch) | |
tree | 9e417c713178925f99c36939cace0a726cf9d018 /builtin-fast-export.c | |
parent | 68daa64df2363f848d818dda9fc414511d9330da (diff) | |
parent | d0b92a3f6e4d98a38a86cbd86f0e39eea9005958 (diff) | |
download | git-0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08.tar.gz |
Merge branch 'maint'
* maint:
index-pack: setup git repository
Suppress some bash redirection error messages
Fix a warning (on cygwin) to allow -Werror
Fix "git log -i --grep"
Diffstat (limited to 'builtin-fast-export.c')
-rw-r--r-- | builtin-fast-export.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 070971616d..7c93eb878d 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -417,7 +417,8 @@ static void export_marks(char *file) for (i = 0; i < idnums.size; i++) { if (deco->base && deco->base->type == 1) { mark = ptr_to_mark(deco->decoration); - fprintf(f, ":%u %s\n", mark, sha1_to_hex(deco->base->sha1)); + fprintf(f, ":%"PRIu32" %s\n", mark, + sha1_to_hex(deco->base->sha1)); } deco++; } |