зеркало из https://github.com/microsoft/git.git
revision.c: fix "dense" under --remove-empty
It had the wrong test for whether a commit was a merge. What it did was to say that a non-merge has exactly one parent (which sounds almost right), but the fact is, initial trees have no parent at all, but they're obviously not merges. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
0556a11a0d
Коммит
02d3dca3bf
|
@ -997,7 +997,7 @@ struct commit *get_revision(struct rev_info *revs)
|
||||||
if (!revs->parents)
|
if (!revs->parents)
|
||||||
continue;
|
continue;
|
||||||
/* non-merge - always ignore it */
|
/* non-merge - always ignore it */
|
||||||
if (commit->parents && !commit->parents->next)
|
if (!commit->parents || !commit->parents->next)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (revs->parents)
|
if (revs->parents)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче