[PATCH] fetch.c: Remove redundant SCANNED flag

After adding the SEEN flag, the SCANNED flag became obviously
redundant - each object can get into process_queue through process()
only once, and therefore multiple calls to process_object() for the
same object are not possible.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/fetch.c b/fetch.c
index bcdacaf77f403a56c8789e4a67d2899de1e445e1..a1748e0b3ded9c60ae6b37c599e6b837482e87e0 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -57,7 +57,6 @@ static int process_tree(struct tree *tree)
 #define COMPLETE       1U
 #define TO_FETCH       2U
 #define TO_SCAN                4U
 #define COMPLETE       1U
 #define TO_FETCH       2U
 #define TO_SCAN                4U

-#define SCANNED                8U

 #define SEEN           16U
 
 static struct commit_list *complete = NULL;
 #define SEEN           16U
 
 static struct commit_list *complete = NULL;


@@ -106,10 +105,6 @@ static struct object_list **process_queue_end = &process_queue;
 
 static int process_object(struct object *obj)
 {
 
 static int process_object(struct object *obj)
 {

-       if (obj->flags & SCANNED)
-               return 0;
-       obj->flags |= SCANNED;
-

        if (obj->type == commit_type) {
                if (process_commit((struct commit *)obj))
                        return -1;
        if (obj->type == commit_type) {
                if (process_commit((struct commit *)obj))
                        return -1;


@@ -142,7 +137,7 @@ static int process(struct object *obj)
        if (has_sha1_file(obj->sha1)) {
                parse_object(obj->sha1);
                /* We already have it, so we should scan it now. */
        if (has_sha1_file(obj->sha1)) {
                parse_object(obj->sha1);
                /* We already have it, so we should scan it now. */

-               if (obj->flags & (SCANNED | TO_SCAN))
+               if (obj->flags & TO_SCAN)

                        return 0;
                object_list_insert(obj, process_queue_end);
                process_queue_end = &(*process_queue_end)->next;
                        return 0;
                object_list_insert(obj, process_queue_end);
                process_queue_end = &(*process_queue_end)->next;