{"thread":{"id":"8742","subject":"[PATCH] cleanup merge-base test script","startedAt":"2007-06-26T23:44:22Z","lastAt":"2007-06-26T23:44:22Z","messageCount":1,"participants":["Sam Vilain"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"45860","messageId":"11829014621752-git-send-email-sam.vilain@catalyst.net.nz","threadId":"8742","inReplyTo":null,"subject":"[PATCH] cleanup merge-base test script","fromName":"Sam Vilain","fromEmail":"sam.vilain@catalyst.net.nz","sentAt":"2007-06-26T23:44:22Z","receivedAt":"2007-06-26T23:44:22Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Add a picture, and keep the setup and the tests together.\n\nSigned-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>\n---\n t/t6010-merge-base.sh |   30 ++++++++++++++++++------------\n 1 files changed, 18 insertions(+), 12 deletions(-)\n\ndiff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh\nindex b15920b..22e0893 100755\n--- a/t/t6010-merge-base.sh\n+++ b/t/t6010-merge-base.sh\n@@ -34,6 +34,12 @@ doit() {\n \techo $commit\n }\n \n+#  E---D---C---B---A\n+#  \\'-_         \\   \\\n+#   \\  `---------G   \\\n+#    \\                \\\n+#     F----------------H\n+\n # Setup...\n E=$(doit 5 E)\n D=$(doit 4 D $E)\n@@ -44,6 +50,18 @@ A=$(doit 1 A $B)\n G=$(doit 7 G $B $E)\n H=$(doit 8 H $A $F)\n \n+test_expect_success 'compute merge-base (single)' \\\n+    'MB=$(git-merge-base G H) &&\n+     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n+\n+test_expect_success 'compute merge-base (all)' \\\n+    'MB=$(git-merge-base --all G H) &&\n+     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n+\n+test_expect_success 'compute merge-base with show-branch' \\\n+    'MB=$(git-show-branch --merge-base G H) &&\n+     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n+\n # Setup for second test to demonstrate that relying on timestamps in a\n # distributed SCM to provide a _consistent_ partial ordering of commits\n # leads to insanity.\n@@ -82,18 +100,6 @@ PL=$(doit  4 PL $L2 $C2)\n PR=$(doit  4 PR $C2 $R2)\n \n test_expect_success 'compute merge-base (single)' \\\n-    'MB=$(git-merge-base G H) &&\n-     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n-\n-test_expect_success 'compute merge-base (all)' \\\n-    'MB=$(git-merge-base --all G H) &&\n-     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n-\n-test_expect_success 'compute merge-base with show-branch' \\\n-    'MB=$(git-show-branch --merge-base G H) &&\n-     expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/B\"'\n-\n-test_expect_success 'compute merge-base (single)' \\\n     'MB=$(git-merge-base PL PR) &&\n      expr \"$(git-name-rev \"$MB\")\" : \"[0-9a-f]* tags/C2\"'\n \n-- \n1.5.2.1.1131.g3b90\n"}]}