From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Aug 2008 07:37:34 +0000 (-0700)
Subject: revision --simplify-merges: do not leave commits unprocessed
X-Git-Tag: v1.6.1-rc1~275^2~1^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53030f8d1199ef9da86e7ddc2b8a659a355e5f69;p=git.git

revision --simplify-merges: do not leave commits unprocessed

When we still do not know how parents of a commit simplify to, we should
defer processing of the commit, not discard it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/revision.c b/revision.c
index 33cb207f2..8cd39da2e 100644
--- a/revision.c
+++ b/revision.c
@@ -1459,8 +1459,10 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c
 			cnt++;
 		}
 	}
-	if (cnt)
+	if (cnt) {
+		tail = &commit_list_insert(commit, tail)->next;
 		return tail;
+	}
 
 	/*
 	 * Rewrite our list of parents.