mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/cocci'

Browse Source 
Code cleanup.

* rs/cocci:
  use strbuf_addstr() for adding constant strings to a strbuf, part 2
  add coccicheck make target
  contrib/coccinelle: fix semantic patch for oid_to_hex_r()
This commit is contained in:
Junio C Hamano
2016-09-26 16:09:14 -07:00
parent 6fe1b1407e a22ae753cb
commit 85f34a929d
9 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -206,7 +206,7 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
find_unique_abbrev(commit->object.oid.hash,
DEFAULT_ABBREV));
if (parse_commit(commit) != 0)
strbuf_addf(&o->obuf, _("(bad commit)\n"));
strbuf_addstr(&o->obuf, _("(bad commit)\n"));
else {
const char *title;
const char *msg = get_commit_buffer(commit, NULL);