From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Jul 2015 22:08:03 +0000 (-0700)
Subject: rerere: handle conflicts with multiple stage #1 entries
X-Git-Tag: v2.7.0-rc0~149^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eda906b2873c986fa61406dafb6acd99e70d540;p=thirdparty%2Fgit.git

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 e307711f81..b453a80085 100644
--- a/rerere.c
+++ b/rerere.c
@@ -369,7 +369,7 @@ static int check_one_conflict(int i, int *type)
 	}
 
 	*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 */