{"thread":{"id":"35582","subject":"[PATCH 2/2] t6010: add test to git merge-base --all --octopus","startedAt":"2013-12-28T11:04:41Z","lastAt":"2013-12-28T11:04:41Z","messageCount":1,"participants":["Василий Макаров"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"232487","messageId":"CABEtfDFRYkbVsJc2SZcCPwyUBAN=3dMv9yoYuoRce4c7VBxrkg@mail.gmail.com","threadId":"35582","inReplyTo":null,"subject":"[PATCH 2/2] t6010: add test to git merge-base --all --octopus","fromName":"Василий Макаров","fromEmail":"einmalfel@gmail.com","sentAt":"2013-12-28T11:04:41Z","receivedAt":"2013-12-28T11:04:41Z","isPatch":true,"sender":{"key":"einmalfel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2640813?v=4"},"body":"And here is the test:\n\nwith git 1.8.5.2 this test don't pass because of git merge-base may\nreturn duplicates and incorrect set of bases (not best common\nancestors)\n---\n t/t6010-merge-base.sh | 39 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 39 insertions(+)\n\ndiff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh\nindex f80bba8..8652c12 100755\n--- a/t/t6010-merge-base.sh\n+++ b/t/t6010-merge-base.sh\n@@ -230,4 +230,43 @@ test_expect_success 'criss-cross merge-base for\noctopus-step' '\n  test_cmp expected.sorted actual.sorted\n '\n\n+test_expect_success 'merge-base --octopus --all for complex tree' '\n+ # Best common ancestor for JE, JAA and JDD is JC\n+ #             JE\n+ #            / |\n+ #           /  |\n+ #          /   |\n+ #  JAA    /    |\n+ #   |\\   /     |\n+ #   | \\  | JDD |\n+ #   |  \\ |/ |  |\n+ #   |   JC JD  |\n+ #   |    | /|  |\n+ #   |    |/ |  |\n+ #  JA    |  |  |\n+ #   |\\  /|  |  |\n+ #   | JB |  |  |\n+ #   \\  \\ | /   /\n+ #    \\__\\|/___/\n+ #        J\n+ test_commit J &&\n+ test_commit JB &&\n+ git reset --hard J &&\n+ test_commit JC &&\n+ git reset --hard J &&\n+ test_commit JTEMP1 &&\n+ test_merge JA JB &&\n+ test_merge JAA JC &&\n+ git reset --hard J &&\n+ test_commit JTEMP2 &&\n+ test_merge JD JB &&\n+ test_merge JDD JC &&\n+ git reset --hard J &&\n+ test_commit JTEMP3 &&\n+ test_merge JE JC &&\n+ git rev-parse JC > expected &&\n+ git merge-base --all --octopus JAA JDD JE > actual &&\n+ test_cmp expected actual\n+'\n+\n test_done\n-- \n1.8.3.1\n"}]}