mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
revision.c: really honor --first-parent
In add_parents_to_list, if any parent of a revision had already been SEEN, the current code would continue with the next parent, skipping the test for --first-parent. This patch inverts the test for SEEN so that the test for --first-parent is always performed. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d9c292e8bb
commit
ad1012ebde
@ -467,10 +467,10 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str
|
||||
if (parse_commit(p) < 0)
|
||||
return -1;
|
||||
p->object.flags |= left_flag;
|
||||
if (p->object.flags & SEEN)
|
||||
continue;
|
||||
p->object.flags |= SEEN;
|
||||
insert_by_date(p, list);
|
||||
if (!(p->object.flags & SEEN)) {
|
||||
p->object.flags |= SEEN;
|
||||
insert_by_date(p, list);
|
||||
}
|
||||
if(revs->first_parent_only)
|
||||
break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user