Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
Code fixup. * jk/fix-attribute-macro-in-2.5: remote.c: spell __attribute__ correctlymaint
commit
9ba3b14c64
2
remote.c
2
remote.c
|
@ -1660,7 +1660,7 @@ int branch_merge_matches(struct branch *branch,
|
||||||
return refname_match(branch->merge[i]->src, refname);
|
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, ...)
|
static const char *error_buf(struct strbuf *err, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in New Issue