From: Johannes Schindelin Date: Sat, 23 May 2009 08:04:51 +0000 (+0200) Subject: MinGW: Fix compiler warning in merge-recursive X-Git-Tag: v1.6.4-rc0~124 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b74d779bd90477f6514d0a9be4a75b4c40ed946c;p=git.git 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 Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano --- diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 703045bfc..d26a96e48 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) /* "--" "" "" */ die("Not handling anything other than two heads merge.");