git checkout -b empty-branch &&
test_tick &&
+ git commit --allow-empty -m "empty" &&
+
+ echo third >> file1 &&
+ git add file1 &&
+ test_tick &&
+ git commit --allow-empty-message -m "" &&
+
+ git checkout master &&
+ git checkout -b empty-branch2 &&
+ test_tick &&
git commit --allow-empty -m "empty"
'
-test_expect_code 1 'cherry-pick an empty commit' '
+test_expect_success 'cherry-pick an empty commit' '
+ git checkout master && {
+ git cherry-pick empty-branch^
+ test "$?" = 1
+ }
+'
- git checkout master &&
- git cherry-pick empty-branch
+test_expect_success 'index lockfile was removed' '
+
+ test ! -f .git/index.lock
'
+test_expect_success 'cherry-pick a commit with an empty message' '
+ git checkout master && {
+ git cherry-pick empty-branch
+ test "$?" = 1
+ }
+'
+
test_expect_success 'index lockfile was removed' '
test ! -f .git/index.lock
'
+test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
+ git checkout master &&
+ echo fourth >>file2 &&
+ git add file2 &&
+ git commit -m "fourth" &&
+ test_must_fail git cherry-pick empty-branch2
+'
+
+test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
+ git checkout master &&
+ git cherry-pick --allow-empty empty-branch2
+'
+
+test_expect_success 'cherry pick with --keep-redundant-commits' '
+ git checkout master &&
+ git cherry-pick --keep-redundant-commits HEAD^
+'
+
test_done