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_add_unique_abbrev() for adding short hashes, part 3
  remove unnecessary NULL check before free(3)
This commit is contained in:
Junio C Hamano
2016-10-17 13:25:21 -07:00
parent 9424bf2707 a94bb68397
commit 69e6544998
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@ -202,9 +202,9 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
strbuf_addf(&o->obuf, "virtual %s\n",
merge_remote_util(commit)->name);
else {
strbuf_addf(&o->obuf, "%s ",
find_unique_abbrev(commit->object.oid.hash,
DEFAULT_ABBREV));
strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash,
DEFAULT_ABBREV);
strbuf_addch(&o->obuf, ' ');
if (parse_commit(commit) != 0)
strbuf_addstr(&o->obuf, _("(bad commit)\n"));
else {