MinGW: Fix compiler warning in merge-recursive

dscho · gitster · commit b74d779bd904 · 2009-05-23T01:54:45.000-07:00
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 &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Steffen Prohaska &lt;prohaska@zib.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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.");

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ int cmd_merge_recursive(int argc, const char *argv, const char prefix)`
`45`	`45`	`bases[bases_count++] = sha;`
`46`	`46`	`}`
`47`	`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]);`
`50`	`51`	`}`
`51`	`52`	`if (argc - i != 3) /* "--" "<head>" "<remote>" */`
`52`	`53`	`die("Not handling anything other than two heads merge.");`