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>
Junio C Hamano committed
Jul 24, 2015 at 15:08 UTC
5eda906b2873c986fa61406dafb6acd99e70d540
1 file changed
+1
-1
rerere.c
+1
-1
@@ -369,7 +369,7 @@ static int check_one_conflict(int i, int *type)
369
}
370
371
*type = PUNTED;
372
- if (ce_stage(e) == 1)
372
+ while (ce_stage(active_cache[i]) == 1)
373
i++;
374
375
/* Only handle regular files with both stages #2 and #3 */