summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
commit9ba3b14c64345838310797d5a5cebbf12e2daca3 (patch)
tree194fcc9c1a007c44fd1b2889932d4c18fbfa237e /remote.c
parent777dec64bd4237e503a7471d048053ef7aea739d (diff)
parent060e7766ba34dc4fef351494239235ba365edd18 (diff)
downloadgit-9ba3b14c64345838310797d5a5cebbf12e2daca3.tar.gz
Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
Code fixup. * jk/fix-attribute-macro-in-2.5: remote.c: spell __attribute__ correctly
Diffstat (limited to 'remote.c')
-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) {