From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 24 Apr 2005 02:21:28 +0000 (-0700)
Subject: Don't add parents to the commit list if we have already
X-Git-Tag: v0.99~763
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4056c09114e66ce3c2368551f0122e83628750d6;p=git.git

Don't add parents to the commit list if we have already
seen them.

Otherwise any merges will make the parent list explode.
---

diff --git a/commit.c b/commit.c
index 911f6435a..0243e77cb 100644
--- a/commit.c
+++ b/commit.c
@@ -124,8 +124,11 @@ struct commit *pop_most_recent_commit(struct commit_list **list)
 	free(old);
 
 	while (parents) {
-		parse_commit(parents->item);
-		insert_by_date(list, parents->item);
+		struct commit *commit = parents->item;
+		if (!commit->object.parsed) {
+			parse_commit(commit);
+			insert_by_date(list, commit);
+		}
 		parents = parents->next;
 	}
 	return ret;