undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision.c: really honor --first-parent

Browse Source 
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:
Lars Hjemli 2008-05-12 17:12:36 +02:00 committed by Junio C Hamano
parent d9c292e8bb
commit ad1012ebde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
revision.c
View File

@ -467,10 +467,10 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str
if (parse_commit(p) < 0) if (parse_commit(p) < 0)
return -1; return -1;
p->object.flags |= left_flag; p->object.flags |= left_flag;
if (p->object.flags & SEEN) if (!(p->object.flags & SEEN)) {
continue; p->object.flags |= SEEN;
p->object.flags |= SEEN; insert_by_date(p, list);
insert_by_date(p, list); }
if(revs->first_parent_only) if(revs->first_parent_only)
break; break;
} }