Merge 'refs/rewritten/junio/master' into HEAD

kasal · kasal · commit 6978d61f777e · 2014-05-15T09:43:47.000+02:00
diff --git 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 ?

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