[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0dbbbc1)
MinGW: Fix compiler warning in merge-recursive
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 23 May 2009 08:04:51 +0000 (10:04 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:54:45 +0000 (01:54 -0700)
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>
builtin-merge-recursive.c patch | blob | history

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 703045bfc84a804f5cf58537117fb17859951f7e..d26a96e486f2a84fdfc54527d15b9acdf7ea34bb 100644 (file)
--- 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.");
Git - the stupid content tracker