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 911f6435a74b93f6d25c6852d1814fa8dbaf626e..0243e77cb8e839e2972a2882bb1d0719f6e3cff1 100644 (file)
--- 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;