summaryrefslogtreecommitdiff
path: root/t/t3503-cherry-pick-root.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-05-12 11:10:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-16 20:05:03 (GMT)
commite9fe74cba4ed4577dcc02f61094c611a1c216fee (patch)
treece0916554a98fc9d1c5627e19b78bacb9f79ff2f /t/t3503-cherry-pick-root.sh
parentfad2652673247203014e2c57622a5ffe0eb5ad93 (diff)
downloadgit-e9fe74cba4ed4577dcc02f61094c611a1c216fee.zip
git-e9fe74cba4ed4577dcc02f61094c611a1c216fee.tar.gz
git-e9fe74cba4ed4577dcc02f61094c611a1c216fee.tar.bz2
t3503: test cherry picking and reverting root commits
We already tested cherry-picking a root commit, but only with the internal merge-recursive strategy. Let's also test the recently-allowed reverting of a root commit, as well as testing with external strategies (which until recently triggered a segfault). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3503-cherry-pick-root.sh')
-rwxr-xr-xt/t3503-cherry-pick-root.sh27
1 files changed, 25 insertions, 2 deletions
diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh
index b0faa29..9aefe3a 100755
--- a/t/t3503-cherry-pick-root.sh
+++ b/t/t3503-cherry-pick-root.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='test cherry-picking a root commit'
+test_description='test cherry-picking (and reverting) a root commit'
. ./test-lib.sh
@@ -23,7 +23,30 @@ test_expect_success setup '
test_expect_success 'cherry-pick a root commit' '
git cherry-pick master &&
- test first = $(cat file1)
+ echo first >expect &&
+ test_cmp expect file1
+
+'
+
+test_expect_success 'revert a root commit' '
+
+ git revert master &&
+ test_path_is_missing file1
+
+'
+
+test_expect_success 'cherry-pick a root commit with an external strategy' '
+
+ git cherry-pick --strategy=resolve master &&
+ echo first >expect &&
+ test_cmp expect file1
+
+'
+
+test_expect_success 'revert a root commit with an external strategy' '
+
+ git revert --strategy=resolve master &&
+ test_path_is_missing file1
'