From: Jon Seymour <jon.seymour@gmail.com>
Date: Wed, 6 Jul 2005 16:39:35 +0000 (+1000)
Subject: [PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
X-Git-Tag: v0.99~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ff9206e72c71aa2e51c7cbee911f47b5838a5845;p=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>
---

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) {
 					/*