Merge branch 'lt/unitype' into js/c-merge-recursive

diff --git a/merge-recursive.c b/merge-recursive.c
index cf81768ee9092dcb1bb55fb99aa4f1ed7fd5071c..8d30519db177dd63ee360d6d08fb58d70a42a834 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1501,7 +1501,7 @@ static struct commit *get_ref(const char *ref)
        if (get_sha1(ref, sha1))
                die("Could not resolve ref '%s'", ref);
        object = deref_tag(parse_object(sha1), ref, strlen(ref));
-       if (object->type != TYPE_COMMIT)
+       if (object->type != OBJ_COMMIT)
                return NULL;
        if (parse_commit((struct commit *)object))
                die("Could not parse commit '%s'", sha1_to_hex(object->sha1));