Merge branch 'jk/drop-free-refspecs'

diff --git a/log-tree.c b/log-tree.c
index 169fd039fd31e79dbcb56bf96c30eb60d628dd09..a4ec11c2bf62bbda4304d19913f25965247d4027 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -105,13 +105,13 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
                        warning("invalid replace ref %s", refname);
                        return 0;
                }
-               obj = parse_object(original_oid.hash);
+               obj = parse_object(&original_oid);
                if (obj)
                        add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
                return 0;
        }
 
-       obj = parse_object(oid->hash);
+       obj = parse_object(oid);
        if (!obj)
                return 0;
 
@@ -132,7 +132,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
                if (!obj)
                        break;
                if (!obj->parsed)
-                       parse_object(obj->oid.hash);
+                       parse_object(&obj->oid);
                add_name_decoration(DECORATION_REF_TAG, refname, obj);
        }
        return 0;
@@ -488,7 +488,7 @@ static void show_one_mergetag(struct commit *commit,
        size_t payload_size, gpg_message_offset;
 
        hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), oid.hash);
-       tag = lookup_tag(oid.hash);
+       tag = lookup_tag(&oid);
        if (!tag)
                return; /* error message already given */