{"thread":{"id":"1129","subject":"[PATCH 2/2] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)","startedAt":"2005-07-06T14:44:08Z","lastAt":"2005-07-06T14:44:08Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"5710","messageId":"20050706144408.17769.qmail@blackcubes.dyndns.org","threadId":"1129","inReplyTo":null,"subject":"[PATCH 2/2] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-07-06T14:44:08Z","receivedAt":"2005-07-06T14:44:08Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"\nThis patch passes the test case in the first patch of this series.\n\nSigned-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\n\n epoch.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ne4f793b932b30a7bee16610e311630515fe88330\ndiff --git a/epoch.c b/epoch.c\n--- a/epoch.c\n+++ b/epoch.c\n@@ -612,7 +612,7 @@ int sort_list_in_merge_order(struct comm\n \t\twhile (reversed) {\n \t\t\tstruct commit * next = pop_commit(&reversed);\n \n-\t\t\tif (!(next->object.flags & VISITED)) {\n+\t\t\tif (!(next->object.flags & VISITED) && next!=base) {\n \t\t\t\tsort_first_epoch(next, &stack);\n \t\t\t\tif (reversed) {\n \t\t\t\t\t/*\n------------\n"}]}