3 test_description='test cherry-picking an empty commit'
7 test_expect_success setup '
12 git commit -m "first" &&
14 git checkout -b empty-branch &&
16 git commit --allow-empty -m "empty" &&
18 echo third >> file1 &&
21 git commit --allow-empty-message -m ""
25 test_expect_success 'cherry-pick an empty commit' '
26 git checkout master && {
27 git cherry-pick empty-branch^
32 test_expect_success 'index lockfile was removed' '
34 test ! -f .git/index.lock
38 test_expect_success 'cherry-pick a commit with an empty message' '
39 git checkout master && {
40 git cherry-pick empty-branch
45 test_expect_success 'index lockfile was removed' '
47 test ! -f .git/index.lock