rerere: stop looping unnecessarily

handle_cache() loops 3 times starting from an index entry that is
unmerged, while ignoring an entry for a path that is different from
what we are looking for.

As the index is sorted, once we see a different path, we know we saw
all stages for the path we are interested in.  Just loop while we
see the same path and then break, instead of continuing for 3 times.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/rerere.c b/rerere.c
index 2bce1c875e6c450fa1e76fe7f61e993da1fba695..e1d527c2506a461687ec89421f08b2de355dd10a 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -329,24 +329,21 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
                return -1;
        pos = -pos - 1;
 
                return -1;
        pos = -pos - 1;
 

-       for (i = 0; i < 3; i++) {
+       while (pos < active_nr) {

                enum object_type type;
                unsigned long size;
                enum object_type type;
                unsigned long size;

-               int j;

 
 

-               if (active_nr <= pos)
-                       break;

                ce = active_cache[pos++];
                if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
                ce = active_cache[pos++];
                if (ce_namelen(ce) != len || memcmp(ce->name, path, len))

-                       continue;
-               j = ce_stage(ce) - 1;
-               mmfile[j].ptr = read_sha1_file(ce->sha1, &type, &size);
-               mmfile[j].size = size;
+                       break;
+               i = ce_stage(ce) - 1;
+               mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
+               mmfile[i].size = size;

        }
        }

-       for (i = 0; i < 3; i++) {
+       for (i = 0; i < 3; i++)

                if (!mmfile[i].ptr && !mmfile[i].size)
                        mmfile[i].ptr = xstrdup("");
                if (!mmfile[i].ptr && !mmfile[i].size)
                        mmfile[i].ptr = xstrdup("");

-       }
+

        /*
         * NEEDSWORK: handle conflicts from merges with
         * merge.renormalize set, too
        /*
         * NEEDSWORK: handle conflicts from merges with
         * merge.renormalize set, too