From 53030f8d1199ef9da86e7ddc2b8a659a355e5f69 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Aug 2008 00:37:34 -0700 Subject: [PATCH] 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 --- revision.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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. -- 2.26.2