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

The type doesn't come from the parsing, the type also has to match the usage.

diff --git a/commit.c b/commit.c
index c0dd689ea3be3ef8d161cac056350e61851e7f64..c6fdfd49197df99cdabf761e8e307f781a45086d 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -15,7 +15,7 @@ struct commit *lookup_commit(unsigned char *sha1)
                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;

diff --git a/tree.c b/tree.c
index 23476da7deb4eaa98a7f872eed4981b274904af7..3537c115584e66309f50447d6e89404bd4631519 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -80,7 +80,7 @@ struct tree *lookup_tree(unsigned char *sha1)
                ret->object.type = tree_type;
                return ret;
        }
-       if (obj->parsed && obj->type != tree_type) {
+       if (obj->type != tree_type) {
                error("Object %s is a %s, not a tree", 
                      sha1_to_hex(sha1), obj->type);
                return NULL;