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 <junkio@cox.net>
Junio C Hamano committed
Feb 25, 2007 at 01:24 UTC
ab242f809a9e06ebf935c0512155fc5661ab84ab
1 file changed
+1
-1
builtin-rerere.c
+1
-1
@@ -160,7 +160,7 @@ static int find_conflict(struct path_list *conflict)
160
ce_stage(e3) == 3 && ce_same_name(e1, e2) &&
161
ce_same_name(e1, e3)) {
162
path_list_insert((const char *)e1->name, conflict);
163
- i += 3;
163
+ i += 2;
164
}
165
}
166
return 0;