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>
Johannes Schindelin committed
May 23, 2009 at 10:04 UTC
b74d779bd90477f6514d0a9be4a75b4c40ed946c
1 file changed
+3
-2
builtin-merge-recursive.c
+3
-2
@@ -45,8 +45,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
45
bases[bases_count++] = sha;
46
}
47
else
48
- warning("Cannot handle more than %zu bases. "
49
- "Ignoring %s.", ARRAY_SIZE(bases)-1, argv[i]);
48
+ warning("Cannot handle more than %d bases. "
49
+ "Ignoring %s.",
50
+ (int)ARRAY_SIZE(bases)-1, argv[i]);
51
}
52
if (argc - i != 3) /* "--" "<head>" "<remote>" */
53
die("Not handling anything other than two heads merge.");