[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)

[git.git] / epoch.c

diff --git a/epoch.c b/epoch.c
index 7888f1d..01fe8e4 100644 (file)
--- 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) {
                                        /*