From ab242f809a9e06ebf935c0512155fc5661ab84ab Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 25 Feb 2007 01:24:34 -0800 Subject: [PATCH] rerere: do not skip two conflicted paths next to each other. The code forgot to take the for (;;) loop control into account, incrementing the index once too many. Signed-off-by: Junio C Hamano --- builtin-rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-rerere.c b/builtin-rerere.c index 318d959d89..ac0bf335a8 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -160,7 +160,7 @@ static int find_conflict(struct path_list *conflict) ce_stage(e3) == 3 && ce_same_name(e1, e2) && ce_same_name(e1, e3)) { path_list_insert((const char *)e1->name, conflict); - i += 3; + i += 2; } } return 0; -- 2.11.4.GIT