Verify that the object type matches for tree/commit objects even before parsing.

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index 2502688..c6fdfd4 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -12,9 +12,10 @@ struct commit *lookup_commit(unsigned char *sha1)
                struct commit *ret = malloc(sizeof(struct commit));
                memset(ret, 0, sizeof(struct commit));
                created_object(sha1, &ret->object);
+               ret->object.type = commit_type;
                return ret;
        }
-       if (obj->parsed && obj->type != commit_type) {
+       if (obj->type != commit_type) {
                error("Object %s is a %s, not a commit", 
                      sha1_to_hex(sha1), obj->type);
                return NULL;
@@ -56,7 +57,6 @@ int parse_commit(struct commit *item)
        if (strcmp(type, commit_type))
                return error("Object %s not a commit",
                             sha1_to_hex(item->object.sha1));
-       item->object.type = commit_type;
        get_sha1_hex(bufptr + 5, parent);
        item->tree = lookup_tree(parent);
        add_ref(&item->object, &item->tree->object);