checkout -m: attempt merge when deletion of path was staged

diff --git a/log-tree.c b/log-tree.c
index 8534d91826f3cf05f810a28728ee8bd51649d819..1982631ca497002b746873cd62fabbc4b7f9d3ce 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -134,6 +134,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
                obj = ((struct tag *)obj)->tagged;
                if (!obj)
                        break;
+               if (!obj->parsed)
+                       parse_object(obj->sha1);
                add_name_decoration(DECORATION_REF_TAG, refname, obj);
        }
        return 0;