diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-18 00:37:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-18 00:37:34 -0700 |
| commit | 53030f8d1199ef9da86e7ddc2b8a659a355e5f69 (patch) | |
| tree | 8e3323097e24528190fa7f4568872c46655a81fb | |
| parent | faf0156b278d1a760362cda1d294a88be7608de4 (diff) | |
| download | git-53030f8d1199ef9da86e7ddc2b8a659a355e5f69.tar.gz git-53030f8d1199ef9da86e7ddc2b8a659a355e5f69.tar.xz | |
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>
| -rw-r--r-- | revision.c | 4 |
1 files changed, 3 insertions, 1 deletions
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. |