kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sv/first-parent' 

* sv/first-parent:
  revision.c: really honor --first-parent
  Simplify and fix --first-parent implementation
maint
Junio C Hamano 2008-05-21 14:15:52 -07:00
parent 1fe82d609f ad1012ebde
commit f0abea652b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
revision.c
View File

@ -416,7 +416,6 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str
{
struct commit_list *parent = commit->parents;
unsigned left_flag;
int add, rest;

if (commit->object.flags & ADDED)
return 0;
@ -463,19 +462,18 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str

left_flag = (commit->object.flags & SYMMETRIC_LEFT);

rest = !revs->first_parent_only;
for (parent = commit->parents, add = 1; parent; add = rest) {
for (parent = commit->parents; parent; parent = parent->next) {
struct commit *p = parent->item;

parent = parent->next;
if (parse_commit(p) < 0)
return -1;
p->object.flags |= left_flag;
if (p->object.flags & SEEN)
continue;
p->object.flags |= SEEN;
if (add)
if (!(p->object.flags & SEEN)) {
p->object.flags |= SEEN;
insert_by_date(p, list);
}
if(revs->first_parent_only)
break;
}
return 0;
}