diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:37:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:37:41 -0700 |
| commit | 0e66f8722c18194665084e85180bd9f3276f3960 (patch) | |
| tree | 8891513fc81ecf6bb5bb1f99e38fb6a621c30853 /t | |
| parent | Merge branch 'rg/copy-gecos-username' into maint (diff) | |
| parent | t3503: test cherry picking and reverting root commits (diff) | |
| download | tgif-0e66f8722c18194665084e85180bd9f3276f3960.tar.xz | |
Merge branch 'jk/cherry-pick-root-with-resolve' into maint
* jk/cherry-pick-root-with-resolve:
t3503: test cherry picking and reverting root commits
revert: allow reverting a root commit
cherry-pick: handle root commits with external strategies
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3503-cherry-pick-root.sh | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh index b0faa29918..9aefe3a1be 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 ' |