rerere: handle conflicts with multiple stage #1 entries

A conflicted index can have multiple stage #1 entries when dealing
with a criss-cross merge and using the "resolve" merge strategy.

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

diff --git a/rerere.c b/rerere.c
index e307711f817a9e599d2a597e59d1c87be2fb7eed..b453a80085a016a08417111b60bd847ea2b3c742 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -369,7 +369,7 @@ static int check_one_conflict(int i, int *type)
        }
 
        *type = PUNTED;
        }
 
        *type = PUNTED;

-       if (ce_stage(e) == 1)
+       while (ce_stage(active_cache[i]) == 1)

                i++;
 
        /* Only handle regular files with both stages #2 and #3 */
                i++;
 
        /* Only handle regular files with both stages #2 and #3 */