git-svn: add test data for SVK merge, with script.
[alt-git.git] / t / t3505-cherry-pick-empty.sh
blobe51e505a9fb902ec7d4cedfa32052f03a04e612e
1 #!/bin/sh
3 test_description='test cherry-picking an empty commit'
5 . ./test-lib.sh
7 test_expect_success setup '
9 echo first > file1 &&
10 git add file1 &&
11 test_tick &&
12 git commit -m "first" &&
14 git checkout -b empty-branch &&
15 test_tick &&
16 git commit --allow-empty -m "empty"
20 test_expect_success 'cherry-pick an empty commit' '
21 git checkout master && {
22 git cherry-pick empty-branch
23 test "$?" = 1
27 test_expect_success 'index lockfile was removed' '
29 test ! -f .git/index.lock
33 test_done