[PATCH] create tar archives of tree on the fly

diff --git a/tree.c b/tree.c
index 79b9625855c017ce0298f62cc398ed4d16964cb1..15a16d560619aee80e41bf816dd8474a3253b1a5 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -9,7 +9,7 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
 {
        int len = strlen(pathname);
        unsigned int size = cache_entry_size(baselen + len);
-       struct cache_entry *ce = malloc(size);
+       struct cache_entry *ce = xmalloc(size);
 
        memset(ce, 0, size);
 
@@ -39,7 +39,7 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                if (S_ISDIR(mode)) {
                        int retval;
                        int pathlen = strlen(path);
-                       char *newbase = malloc(baselen + 1 + pathlen);
+                       char *newbase = xmalloc(baselen + 1 + pathlen);
                        void *eltbuf;
                        char elttype[20];
                        unsigned long eltsize;
@@ -74,12 +74,13 @@ struct tree *lookup_tree(unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct tree *ret = malloc(sizeof(struct tree));
+               struct tree *ret = xmalloc(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;
@@ -96,7 +97,6 @@ int parse_tree(struct tree *item)
        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",
@@ -116,7 +116,7 @@ int parse_tree(struct tree *item)
                    sscanf(bufptr, "%o", &mode) != 1)
                        return -1;
 
-               entry = malloc(sizeof(struct tree_entry_list));
+               entry = xmalloc(sizeof(struct tree_entry_list));
                entry->name = strdup(path + 1);
                entry->directory = S_ISDIR(mode);
                entry->executable = mode & S_IXUSR;
@@ -137,7 +137,8 @@ int parse_tree(struct tree *item)
                        entry->item.blob = lookup_blob(file_sha1);
                        obj = &entry->item.blob->object;
                }
-               add_ref(&item->object, obj);
+               if (obj)
+                       add_ref(&item->object, obj);
 
                *list_p = entry;
                list_p = &entry->next;