git-svn: several graft-branches improvements

diff --git a/fetch.c b/fetch.c
index 1291bbac945781640aba312e30ba3ae274aaee9b..238032b798008cd1f96d5083b63dc582f8191a1d 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -47,13 +47,20 @@ static int process_tree(struct tree *tree)
        desc.buf = tree->buffer;
        desc.size = tree->size;
        while (tree_entry(&desc, &entry)) {
+               struct object *obj = NULL;
+
                if (S_ISDIR(entry.mode)) {
                        struct tree *tree = lookup_tree(entry.sha1);
-                       process_tree(tree);
-               } else {
+                       if (tree)
+                               obj = &tree->object;
+               }
+               else {
                        struct blob *blob = lookup_blob(entry.sha1);
-                       process(&blob->object);
+                       if (blob)
+                               obj = &blob->object;
                }
+               if (!obj || process(obj))
+                       return -1;
        }
        free(tree->buffer);
        tree->buffer = NULL;
@@ -111,27 +118,27 @@ static struct object_list **process_queue_end = &process_queue;
 
 static int process_object(struct object *obj)
 {
-       if (obj->type == commit_type) {
+       if (obj->type == TYPE_COMMIT) {
                if (process_commit((struct commit *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == tree_type) {
+       if (obj->type == TYPE_TREE) {
                if (process_tree((struct tree *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == blob_type) {
+       if (obj->type == TYPE_BLOB) {
                return 0;
        }
-       if (obj->type == tag_type) {
+       if (obj->type == TYPE_TAG) {
                if (process_tag((struct tag *)obj))
                        return -1;
                return 0;
        }
        return error("Unable to determine requirements "
                     "of type %s for %s",
-                    obj->type, sha1_to_hex(obj->sha1));
+                    typename(obj->type), sha1_to_hex(obj->sha1));
 }
 
 static int process(struct object *obj)
@@ -143,7 +150,8 @@ static int process(struct object *obj)
        if (has_sha1_file(obj->sha1)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
-       } else {
+       }
+       else {
                if (obj->flags & COMPLETE)
                        return 0;
                prefetch(obj->sha1);
@@ -171,9 +179,7 @@ static int loop(void)
                 */
                if (! (obj->flags & TO_SCAN)) {
                        if (fetch(obj->sha1)) {
-                               report_missing(obj->type
-                                              ? obj->type
-                                              : "object", obj->sha1);
+                               report_missing(typename(obj->type), obj->sha1);
                                return -1;
                        }
                }
@@ -248,7 +254,8 @@ int pull(char *target)
                if (write_ref_log_details) {
                        msg = xmalloc(strlen(write_ref_log_details) + 12);
                        sprintf(msg, "fetch from %s", write_ref_log_details);
-               } else
+               }
+               else
                        msg = NULL;
                ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
                if (msg)