summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2009-05-23 10:04:51 +0200
committerJunio C Hamano <gitster@pobox.com>2009-05-23 01:54:45 -0700
commitb74d779bd90477f6514d0a9be4a75b4c40ed946c (patch)
tree722dce7fd155d6ca7120d81386ee0bba9c3d9f39 /builtin-merge-recursive.c
parent0dbbbc1e26c9979e34031c09c641893123d18450 (diff)
downloadgit-b74d779bd90477f6514d0a9be4a75b4c40ed946c.tar.gz
MinGW: Fix compiler warning in merge-recursive
GCC 4.4.0 on Windows does not like the format %zu. It is quite unlikely, though, that we need more merge bases than a %d can display, so replace the %zu by a %d. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
-rw-r--r--builtin-merge-recursive.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 703045bfc8..d26a96e486 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -45,8 +45,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
bases[bases_count++] = sha;
}
else
- warning("Cannot handle more than %zu bases. "
- "Ignoring %s.", ARRAY_SIZE(bases)-1, argv[i]);
+ warning("Cannot handle more than %d bases. "
+ "Ignoring %s.",
+ (int)ARRAY_SIZE(bases)-1, argv[i]);
}
if (argc - i != 3) /* "--" "<head>" "<remote>" */
die("Not handling anything other than two heads merge.");