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>
Junio C Hamano committed
Aug 18, 2008 at 00:37 UTC
53030f8d1199ef9da86e7ddc2b8a659a355e5f69
1 file changed
+3
-1
revision.c
+3
-1
@@ -1459,8 +1459,10 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c
1459
cnt++;
1460
}
1461
}
1462
- if (cnt)
1462
+ if (cnt) {
1463
+ tail = &commit_list_insert(commit, tail)->next;
1464
return tail;
1465
+ }
1466
1467
/*
1468
* Rewrite our list of parents.