From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Feb 2007 09:24:34 +0000 (-0800)
Subject: rerere: do not skip two conflicted paths next to each other.
X-Git-Tag: v1.5.0.2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab242f809a9e06ebf935c0512155fc5661ab84ab;p=git.git

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>
---

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 318d959d8..ac0bf335a 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;