{"thread":{"id":"17355","subject":"[PATCH] Add new testcase for git-merge-tree","startedAt":"2009-01-25T18:03:05Z","lastAt":"2009-01-25T18:03:05Z","messageCount":1,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"101847","messageId":"1232906585-12250-1-git-send-email-vmiklos@frugalware.org","threadId":"17355","inReplyTo":null,"subject":"[PATCH] Add new testcase for git-merge-tree","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2009-01-25T18:03:05Z","receivedAt":"2009-01-25T18:03:05Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n t/t6034-merge-tree.sh |   40 ++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 40 insertions(+), 0 deletions(-)\n create mode 100755 t/t6034-merge-tree.sh\n\ndiff --git a/t/t6034-merge-tree.sh b/t/t6034-merge-tree.sh\nnew file mode 100755\nindex 0000000..42bd5e7\n--- /dev/null\n+++ b/t/t6034-merge-tree.sh\n@@ -0,0 +1,40 @@\n+#!/bin/sh\n+\n+test_description='git merge-tree\n+\n+Testing merging two trees without touching the index.'\n+\n+. ./test-lib.sh\n+\n+test_expect_success 'setup' '\n+\techo c0 > c0.c &&\n+\tgit add c0.c &&\n+\tgit commit -m c0 &&\n+\tgit tag c0 &&\n+\techo c1 > c1.c &&\n+\tgit add c1.c &&\n+\tgit commit -m c1 &&\n+\tgit tag c1 &&\n+\tc1=$(git hash-object c1.c)\n+\tgit reset --hard c0 &&\n+\techo c2 > c2.c &&\n+\tgit add c2.c &&\n+\tgit commit -m c2 &&\n+\tgit tag c2\n+\tc2=$(git hash-object c2.c)\n+'\n+\n+test_expect_success 'merge c1 with c2' '\n+\tcat <<EOF >expected &&\n+added in local\n+  our    100644 $c1 c1.c\n+added in remote\n+  their  100644 $c2 c2.c\n+@@ -0,0 +1 @@\n++c2\n+EOF\n+\tgit merge-tree c0 c1 c2 > actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_done\n-- \n1.6.1\n"}]}