Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD

gitster · gitster · commit 9ba3b14c6434 · 2016-05-18T14:40:12.000-07:00
Code fixup.

* jk/fix-attribute-macro-in-2.5:
  remote.c: spell __attribute__ correctly
diff --git a/remote.c b/remote.c
@@ -1660,7 +1660,7 @@ int branch_merge_matches(struct branch *branch,
 	return refname_match(branch->merge[i]->src, refname);
 }
 
-__attribute((format (printf,2,3)))
+__attribute__((format (printf,2,3)))
 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
 {
 	if (err) {

Original file line number	Diff line number	Diff line change
`@@ -1660,7 +1660,7 @@ int branch_merge_matches(struct branch *branch,`
`1660`	`1660`	`return refname_match(branch->merge[i]->src, refname);`
`1661`	`1661`	`}`
`1662`	`1662`
`1663`		`-__attribute((format (printf,2,3)))`
	`1663`	`+__attribute__((format (printf,2,3)))`
`1664`	`1664`	`static const char error_buf(struct strbuf err, const char *fmt, ...)`
`1665`	`1665`	`{`
`1666`	`1666`	`if (err) {`