merge-recur: Get rid of debug code

diff --git a/fetch.c b/fetch.c
index b03c2012ef511ca2cbba2a1bd5e2361c256a12e9..989d7a47884ec7bac05d329baeb97bdb12b7b22e 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -39,27 +39,28 @@ static int process(struct object *obj);
 static int process_tree(struct tree *tree)
 {
        struct tree_desc desc;
+       struct name_entry entry;
 
        if (parse_tree(tree))
                return -1;
 
        desc.buf = tree->buffer;
        desc.size = tree->size;
-       while (desc.size) {
-               unsigned mode;
-               const char *name;
-               const unsigned char *sha1;
-
-               sha1 = tree_entry_extract(&desc, &name, &mode);
-               update_tree_entry(&desc);
-
-               if (S_ISDIR(mode)) {
-                       struct tree *tree = lookup_tree(sha1);
-                       process_tree(tree);
-               } else {
-                       struct blob *blob = lookup_blob(sha1);
-                       process(&blob->object);
+       while (tree_entry(&desc, &entry)) {
+               struct object *obj = NULL;
+
+               if (S_ISDIR(entry.mode)) {
+                       struct tree *tree = lookup_tree(entry.sha1);
+                       if (tree)
+                               obj = &tree->object;
+               }
+               else {
+                       struct blob *blob = lookup_blob(entry.sha1);
+                       if (blob)
+                               obj = &blob->object;
                }
+               if (!obj || process(obj))
+                       return -1;
        }
        free(tree->buffer);
        tree->buffer = NULL;
@@ -117,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 == OBJ_COMMIT) {
                if (process_commit((struct commit *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == tree_type) {
+       if (obj->type == OBJ_TREE) {
                if (process_tree((struct tree *)obj))
                        return -1;
                return 0;
        }
-       if (obj->type == blob_type) {
+       if (obj->type == OBJ_BLOB) {
                return 0;
        }
-       if (obj->type == tag_type) {
+       if (obj->type == OBJ_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)
@@ -149,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);
@@ -177,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;
                        }
                }
@@ -215,7 +215,7 @@ static int mark_complete(const char *path, const unsigned char *sha1)
 
 int pull(char *target)
 {
-       struct ref_lock *lock;
+       struct ref_lock *lock = NULL;
        unsigned char sha1[20];
        char *msg;
        int ret;
@@ -235,15 +235,18 @@ int pull(char *target)
 
        if (interpret_target(target, sha1)) {
                error("Could not interpret %s as something to pull", target);
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }
        if (process(lookup_unknown_object(sha1))) {
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }
        if (loop()) {
-               unlock_ref(lock);
+               if (lock)
+                       unlock_ref(lock);
                return -1;
        }
 
@@ -251,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)