[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 7888f1d..01fe8e4 100644
--- a/epoch.c
+++ b/epoch.c
@@ -606,7 +606,7 @@
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) {
/*
