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

Jon Seymour· Jul 6, 2005, 16:39 UTC · lore

This patch passes the test case introduced by the previous patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---

 epoch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

6f7f90901ec4aafd12ac4179110b78fc426395cd

Show changes to epoch.c +1 −1

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

patch, 13 partsFixes a problem with --merge-order A B (A is linear descendent of a merge B)