diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
commit | f0798e6cdbf99515391242e20f8df495a14e9c22 (patch) | |
tree | de83eeb548197f6c2493a48a617b0f47e4d39a79 /diff.c | |
parent | 578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 (diff) | |
parent | 353d84c537485500989b190c5af93ad224264e2c (diff) | |
download | git-f0798e6cdbf99515391242e20f8df495a14e9c22.tar.gz |
Merge branch 'rs/cocci'
Code clean-up with help from coccinelle tool continues.
* rs/cocci:
coccicheck: make transformation for strbuf_addf(sb, "...") more precise
use strbuf_add_unique_abbrev() for adding short hashes, part 2
use strbuf_addstr() instead of strbuf_addf() with "%s", part 2
gitignore: ignore output files of coccicheck make target
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3109,7 +3109,7 @@ static void fill_metainfo(struct strbuf *msg, } strbuf_addf(msg, "%s%sindex %s..", line_prefix, set, find_unique_abbrev(one->oid.hash, abbrev)); - strbuf_addstr(msg, find_unique_abbrev(two->oid.hash, abbrev)); + strbuf_add_unique_abbrev(msg, two->oid.hash, abbrev); if (one->mode == two->mode) strbuf_addf(msg, " %06o", one->mode); strbuf_addf(msg, "%s\n", reset); |