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

merge: use commit-slab in merge remote desc instead of commit->util

Browse Source 
It's done so that commit->util can be removed. See more explanation in
the commit that removes commit->util.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-05-19 07:28:30 +02:00
committed by Junio C Hamano
parent 7b680d32f3
commit e2e5ac2303
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -223,10 +223,12 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
static void output_commit_title(struct merge_options *o, struct commit *commit)
{
struct merge_remote_desc *desc;
strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
if (commit->util)
strbuf_addf(&o->obuf, "virtual %s\n",
merge_remote_util(commit)->name);
desc = merge_remote_util(commit);
if (desc)
strbuf_addf(&o->obuf, "virtual %s\n", desc->name);
else {
strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
DEFAULT_ABBREV);