[PATCH 5/5] MinGW: Fix compiler warning in merge-recursive
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- May 23, 2009, 08:04 UTC
- Message-ID
- <1243065891-13270-6-git-send-email-prohaska@zib.de>
- In-Reply-To
- <1243065891-13270-5-git-send-email-prohaska@zib.de>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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> --- builtin-merge-recursive.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 703045b..d26a96e 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.");
-- 1.6.3.1.54.g99dd