Merge branch 'du/rev-parse-is-plumbing' into maint

diff --git a/rerere.c b/rerere.c
index c7787aa07f80f00589e3c4f4e4e3cc825c43044e..783d4dae2aa2d7a17c37dfac892e1acdeb4b1db8 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 */