[PATCH 13/13] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
From: Jon Seymour <hidden>
Date: 2016-06-15 22:42:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
This patch passes the test case introduced by the previous patch. Signed-off-by: Jon Seymour <redacted> --- epoch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 6f7f90901ec4aafd12ac4179110b78fc426395cd
diff --git a/epoch.c b/epoch.c
--- a/epoch.c
+++ b/epoch.c@@ -612,7 +612,7 @@ int sort_list_in_merge_order(struct comm while (reversed) { struct commit * next = pop_commit(&reversed); - if (!(next->object.flags & VISITED)) { + if (!(next->object.flags & VISITED) && next!=base) { sort_first_epoch(next, &stack); if (reversed) { /* ------------