kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2016-05-18 14:40:12 -07:00
parent 777dec64bd 060e7766ba
commit 9ba3b14c64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remote.c
View File

@ -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) {