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

[git.git] / tree.c

diff --git a/tree.c b/tree.c
index e988aed..3537c11 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -77,9 +77,10 @@ struct tree *lookup_tree(unsigned char *sha1)
                struct tree *ret = malloc(sizeof(struct tree));
                memset(ret, 0, sizeof(struct tree));
                created_object(sha1, &ret->object);
+               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;
@@ -92,10 +93,10 @@ int parse_tree(struct tree *item)
        char type[20];
        void *buffer, *bufptr;
        unsigned long size;
+       struct tree_entry_list **list_p;
        if (item->object.parsed)
                return 0;
        item->object.parsed = 1;
-       item->object.type = tree_type;
        buffer = bufptr = read_sha1_file(item->object.sha1, type, &size);
        if (!buffer)
                return error("Could not read %s",
@@ -103,8 +104,10 @@ int parse_tree(struct tree *item)
        if (strcmp(type, tree_type))
                return error("Object %s not a tree",
                             sha1_to_hex(item->object.sha1));
+       list_p = &item->entries;
        while (size) {
                struct object *obj;
+               struct tree_entry_list *entry;
                int len = 1+strlen(bufptr);
                unsigned char *file_sha1 = bufptr + len;
                char *path = strchr(bufptr, ' ');
@@ -113,6 +116,12 @@ int parse_tree(struct tree *item)
                    sscanf(bufptr, "%o", &mode) != 1)
                        return -1;
 
+               entry = malloc(sizeof(struct tree_entry_list));
+               entry->name = strdup(path + 1);
+               entry->directory = S_ISDIR(mode);
+               entry->executable = mode & S_IXUSR;
+               entry->next = NULL;
+
                /* Warn about trees that don't do the recursive thing.. */
                if (strchr(path, '/')) {
                        item->has_full_path = 1;
@@ -121,12 +130,17 @@ int parse_tree(struct tree *item)
                bufptr += len + 20;
                size -= len + 20;
 
-               if (S_ISDIR(mode)) {
-                       obj = &lookup_tree(file_sha1)->object;
+               if (entry->directory) {
+                       entry->item.tree = lookup_tree(file_sha1);
+                       obj = &entry->item.tree->object;
                } else {
-                       obj = &lookup_blob(file_sha1)->object;
+                       entry->item.blob = lookup_blob(file_sha1);
+                       obj = &entry->item.blob->object;
                }
                add_ref(&item->object, obj);
+
+               *list_p = entry;
+               list_p = &entry->next;
        }
        return 0;
 }