Merge branch 'fixes'

diff --git a/fetch.c b/fetch.c
index 390de99f2aebcc8d3098c556120af5d6298ab10a..e6fd624c12323386ac64dd11f388d6d049086e66 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -54,9 +54,9 @@ static int process_tree(struct tree *tree)
        return 0;
 }
 
-#define COMPLETE       1U
-#define TO_SCAN                4U
-#define SEEN           16U
+#define COMPLETE       (1U << 0)
+#define SEEN           (1U << 1)
+#define TO_SCAN                (1U << 2)
 
 static struct commit_list *complete = NULL;
 
@@ -134,22 +134,16 @@ static int process(struct object *obj)
        obj->flags |= SEEN;
 
        if (has_sha1_file(obj->sha1)) {
-               parse_object(obj->sha1);
                /* We already have it, so we should scan it now. */
-               if (obj->flags & TO_SCAN)
-                       return 0;
-               object_list_insert(obj, process_queue_end);
-               process_queue_end = &(*process_queue_end)->next;
                obj->flags |= TO_SCAN;
-               return 0;
+       } else {
+               if (obj->flags & COMPLETE)
+                       return 0;
+               prefetch(obj->sha1);
        }
-       if (obj->flags & COMPLETE)
-               return 0;
+               
        object_list_insert(obj, process_queue_end);
        process_queue_end = &(*process_queue_end)->next;
-
-       prefetch(obj->sha1);
-               
        return 0;
 }