Sync with maint

gitster · gitster · commit fb238fb4bab6 · 2016-03-21T13:32:42.000-07:00
* maint:
  Documentation: fix broken linkgit to git-config
  git-compat-util: st_add4: work around gcc 4.2.x compiler crash
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
@@ -397,7 +397,7 @@ preceding SP is also omitted.  Currently, no commands pass any
 'extra-info'.
 
 The hook always runs after the automatic note copying (see
-"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and
+"notes.rewrite.<command>" in linkgit:git-config[1]) has happened, and
 thus has access to these notes.
 
 The following command-specific comments apply:
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b)
 		    (uintmax_t)a, (uintmax_t)b);
 	return a + b;
 }
-#define st_add3(a,b,c)   st_add((a),st_add((b),(c)))
-#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d)))
+#define st_add3(a,b,c)   st_add(st_add((a),(b)),(c))
+#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d))
 
 static inline size_t st_mult(size_t a, size_t b)
 {

Original file line number	Diff line number	Diff line change
`@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b)`
`715`	`715`	`(uintmax_t)a, (uintmax_t)b);`
`716`	`716`	`return a + b;`
`717`	`717`	`}`
`718`		`-#define st_add3(a,b,c) st_add((a),st_add((b),(c)))`
`719`		`-#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d)))`
	`718`	`+#define st_add3(a,b,c) st_add(st_add((a),(b)),(c))`
	`719`	`+#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d))`
`720`	`720`
`721`	`721`	`static inline size_t st_mult(size_t a, size_t b)`
`722`	`722`	`{`