summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-24 15:08:03 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-24 15:08:05 -0700
commit5eda906b2873c986fa61406dafb6acd99e70d540 (patch)
treec5a39d79274fe6d68e7659ca9fb0e9ad983ae3e3 /rerere.c
parentfb70a06da2f10e8b3255abd76cd6ec1926bd9a40 (diff)
downloadgit-5eda906b2873c986fa61406dafb6acd99e70d540.tar.gz
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>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
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 */