From: Jon Seymour Date: Wed, 06 Jul 2005 14:44:08 GMT Subject: [PATCH 2/2] Fixes a problem with --merge-order A B (A is linear descendent of a merge B) Message-ID: <20050706144408.17769.qmail@blackcubes.dyndns.org> This patch passes the test case in the first patch of this series. Signed-off-by: Jon Seymour --- epoch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) e4f793b932b30a7bee16610e311630515fe88330 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) { /* ------------