Merge branch 'en/rerere-multi-stage-1-fix' into maint

[git/git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index c7787aa..783d4da 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -533,7 +533,7 @@ static int check_one_conflict(int i, int *type)
        }
 
        *type = PUNTED;
-       while (ce_stage(active_cache[i]) == 1)
+       while (i < active_nr && ce_stage(active_cache[i]) == 1)
                i++;
 
        /* Only handle regular files with both stages #2 and #3 */