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

gitster · gitster · commit 531675ad172f · 2014-04-18T11:17:45.000-07:00
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
@@ -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 ?

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,7 @@ int git_parse_ulong(const char value, unsigned long ret)`
`557`	`557`	`return 1;`
`558`	`558`	`}`
`559`	`559`
	`560`	`+NORETURN`
`560`	`561`	`static void die_bad_number(const char name, const char value)`
`561`	`562`	`{`
`562`	`563`	`const char *reason = errno == ERANGE ?`