From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Apr 2014 18:17:44 +0000 (-0700)
Subject: Merge branch 'jk/config-die-bad-number-noreturn'
X-Git-Tag: v2.0.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/531675ad172f984a6dbc2ac840caaf6ba1015eb0?hp=8f87d548b6c1fad5f13886f2b1a5acba2764f3b3

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 6821cef00a..a30cb5c07d 100644
--- 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 ?