diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-19 07:28:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-21 14:07:20 +0900 |
| commit | e2e5ac2303377c28e82b6044b06caebe4a1734c9 (patch) | |
| tree | 7f44f4214e6c8d9913592154949195fbb4037012 /merge-recursive.c | |
| parent | 7b680d32f3e3e2469733a7668fad2253bb4aeb4d (diff) | |
| download | git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.tar.gz git-e2e5ac2303377c28e82b6044b06caebe4a1734c9.tar.xz | |
merge: use commit-slab in merge remote desc instead of commit->util
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 0c0d48624..5537f01f8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); |