merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/ref-filter.c b/ref-filter.c
index d4c2931f3aab14accaa5720c87b2fc58aed83faa..f5f7a70c6d9b8ef36ecfe282167714640cace6b1 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1017,7 +1017,7 @@ static void populate_value(struct ref_array_item *ref)
 
                        head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
                                                  sha1, NULL);
-                       if (!strcmp(ref->refname, head))
+                       if (head && !strcmp(ref->refname, head))
                                v->s = "*";
                        else
                                v->s = " ";