summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:15 -0700
commit643318913fc791790eb30a78531f7ae4eed7155d (patch)
tree6c0f1986b04caa06f04c66ae33b348be27b90ac7
parentMerge branch 'sg/test-lib-simplify-expr-away' (diff)
parentremote.c: spell __attribute__ correctly (diff)
downloadtgif-643318913fc791790eb30a78531f7ae4eed7155d.tar.xz
Merge branch 'jk/fix-attribute-macro-in-2.5'
Code fixup. * jk/fix-attribute-macro-in-2.5: remote.c: spell __attribute__ correctly
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index 28fd676acb..ddc4f8fd48 100644
--- 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) {