зеркало из https://github.com/microsoft/git.git
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
This patch passes the test case introduced by the previous patch. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
4d3a63ba3a
Коммит
ff9206e72c
2
epoch.c
2
epoch.c
|
@ -606,7 +606,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
|
||||||
while (reversed) {
|
while (reversed) {
|
||||||
struct commit * next = pop_commit(&reversed);
|
struct commit * next = pop_commit(&reversed);
|
||||||
|
|
||||||
if (!(next->object.flags & VISITED)) {
|
if (!(next->object.flags & VISITED) && next!=base) {
|
||||||
sort_first_epoch(next, &stack);
|
sort_first_epoch(next, &stack);
|
||||||
if (reversed) {
|
if (reversed) {
|
||||||
/*
|
/*
|
||||||
|
|
Загрузка…
Ссылка в новой задаче