From ff9206e72c71aa2e51c7cbee911f47b5838a5845 Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Thu, 7 Jul 2005 02:39:35 +1000 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- epoch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epoch.c b/epoch.c index 7888f1da4..01fe8e4da 100644 --- a/epoch.c +++ b/epoch.c @@ -606,7 +606,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) 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) { /* -- 2.30.2