add_ref_decoration(): convert local variable original_sha1 to object_id

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/log-tree.c b/log-tree.c
index abf5cc31e5d502781c3bcde0c5401cc657d3a30e..01beb11f65b518e382fa01f18f03c5a9f2ddf529 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -98,14 +98,14 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
        assert(cb_data == NULL);
 
        if (starts_with(refname, "refs/replace/")) {
        assert(cb_data == NULL);
 
        if (starts_with(refname, "refs/replace/")) {

-               unsigned char original_sha1[20];
+               struct object_id original_oid;

                if (!check_replace_refs)
                        return 0;
                if (!check_replace_refs)
                        return 0;

-               if (get_sha1_hex(refname + 13, original_sha1)) {
+               if (get_oid_hex(refname + 13, &original_oid)) {

                        warning("invalid replace ref %s", refname);
                        return 0;
                }
                        warning("invalid replace ref %s", refname);
                        return 0;
                }

-               obj = parse_object(original_sha1);
+               obj = parse_object(original_oid.hash);

                if (obj)
                        add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
                return 0;
                if (obj)
                        add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
                return 0;