mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-26 03:21:17 +02:00
Code

t3503: test cherry picking and reverting root commits

Browse Source 
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>
This commit is contained in:
Jeff King 2011-05-12 07:10:07 -04:00 committed by Junio C Hamano
parent fad2652673
commit e9fe74cba4
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
t/t3503-cherry-pick-root.sh
View File

@ -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
'