Merge branch 'jk/show-index'

diff --git a/merge-recursive.c b/merge-recursive.c
index f110e1c5ecbd6254b25785ecb49f29cb7bb75ed2..404f050cafe919023ec86d14230a0f6455714538 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -286,10 +286,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);