undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: handle conflicts with multiple stage #1 entries

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2015-07-24 15:08:03 -07:00
parent fb70a06da2
commit 5eda906b28
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rerere.c
View File

@ -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 */