rerere: handle conflicts with multiple stage #1 entries

gitster · gitster · commit 5eda906b2873 · 2015-07-24T15:08:05.000-07:00
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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ static int check_one_conflict(int i, int *type)`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`*type = PUNTED;`
`372`		`- if (ce_stage(e) == 1)`
	`372`	`+ while (ce_stage(active_cache[i]) == 1)`
`373`	`373`	`i++;`
`374`	`374`
`375`	`375`	`/* Only handle regular files with both stages #2 and #3 */`