Revert "Use git-merge instead of git-resolve in git-pull."

[git.git] / fetch.c

diff --git a/fetch.c b/fetch.c
index 21b373d..e6fd624 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,7 +134,6 @@ 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. */
                obj->flags |= TO_SCAN;
        } else {