summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-25 09:24:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-25 09:28:44 (GMT)
commitab242f809a9e06ebf935c0512155fc5661ab84ab (patch)
tree4829afb6d0e4a7947756b89207f6e380fb906d18 /builtin-rerere.c
parentcef19c7af5202c547abe4c8a538ac7b9a4970f0e (diff)
downloadgit-ab242f809a9e06ebf935c0512155fc5661ab84ab.zip
git-ab242f809a9e06ebf935c0512155fc5661ab84ab.tar.gz
git-ab242f809a9e06ebf935c0512155fc5661ab84ab.tar.bz2
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>
Diffstat (limited to 'builtin-rerere.c')
-rw-r--r--builtin-rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 318d959..ac0bf33 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;