clone: allow to clone from .git file

[git.git] / t / t3503-cherry-pick-root.sh

diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh
index b0faa299183df5fe06ccaf383bce47cbb9a0cf89..9aefe3a1becac200f2c29beee84fab278f9fcfa0 100755 (executable)
--- 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
 
 '