From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 May 2008 21:15:52 +0000 (-0700)
Subject: Merge branch 'sv/first-parent'
X-Git-Tag: v1.5.6-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f0abea652bf90c5a081f07e35c4a656143e0ec50?hp=1fe82d609f9a6ec146fa39880a04e11eb5275810

Merge branch 'sv/first-parent'

* sv/first-parent:
revision.c: really honor --first-parent
Simplify and fix --first-parent implementation
---

diff --git a/revision.c b/revision.c
index c947e0fa1e..7142cf96cd 100644
--- a/revision.c
+++ b/revision.c
@@ -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;
 }