Merge branch 'jk/config-die-bad-number-noreturn'

Squelch a false compiler warning from older gcc.

* jk/config-die-bad-number-noreturn:
config.c: mark die_bad_number as NORETURN

diff --git a/config.c b/config.c
index 6821cef00a0da56fbdadbd34d179ba5bd125c3a6..a30cb5c07db18a5ac16c1c98b6600c9fe6dc1b73 100644 (file)
--- a/config.c
+++ b/config.c
@@ -557,6 +557,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 ?