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>
This commit is contained in:
Junio C Hamano 2008-08-18 00:37:34 -07:00
Родитель faf0156b27
Коммит 53030f8d11
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -1459,8 +1459,10 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c
cnt++; cnt++;
} }
} }
if (cnt) if (cnt) {
tail = &commit_list_insert(commit, tail)->next;
return tail; return tail;
}
/* /*
* Rewrite our list of parents. * Rewrite our list of parents.