From 2ec943a028b9f921a0853f0a43a1326070982399 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Apr 2014 11:23:14 -0500 Subject: [PATCH] fixup! Merge pull request #159 from kasal/config-c-warning This commit replaces the Git for Windows-only patch by the patch accepted upstream instead. It was performed by the following shell commands: git revert -n 3c87ce5^2 && git cherry-pick -n 06bdc23 && git commit -s --fixup 3c87ce5 (and amending the commit with this commit message) Signed-off-by: Johannes Schindelin --- config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index c3a38aae9e..545ec752f1 100644 --- a/config.c +++ b/config.c @@ -556,6 +556,7 @@ int git_parse_ulong(const char *value, unsigned long *ret) return 1; } +NORETURN static void die_bad_number(const char *name, const char *value) { const char *reason = errno == ERANGE ? @@ -572,7 +573,7 @@ static void die_bad_number(const char *name, const char *value) int git_config_int(const char *name, const char *value) { - int ret = 0; + int ret; if (!git_parse_int(value, &ret)) die_bad_number(name, value); return ret; @@ -580,7 +581,7 @@ int git_config_int(const char *name, const char *value) int64_t git_config_int64(const char *name, const char *value) { - int64_t ret = 0; + int64_t ret; if (!git_parse_int64(value, &ret)) die_bad_number(name, value); return ret; -- 2.11.4.GIT