diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:14 -0700 |
| commit | 85f34a929dc0f8c82f7167fe100d5264d7374876 (patch) | |
| tree | b91491510bf7d8165bcfeb1f3a54bf4d36a05318 /merge-recursive.c | |
| parent | Fourth batch for 2.11 (diff) | |
| parent | use strbuf_addstr() for adding constant strings to a strbuf, part 2 (diff) | |
| download | tgif-85f34a929dc0f8c82f7167fe100d5264d7374876.tar.xz | |
Merge branch 'rs/cocci'
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()
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 3750d2534f..5200d5ccf8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); |