diff options
Diffstat (limited to 't/t3505-cherry-pick-empty.sh')
| -rwxr-xr-x | t/t3505-cherry-pick-empty.sh | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 9aaeabd972..c10b28cf57 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -13,15 +13,33 @@ test_expect_success setup ' git checkout -b empty-branch && test_tick && - git commit --allow-empty -m "empty" + git commit --allow-empty -m "empty" && + + echo third >> file1 && + git add file1 && + test_tick && + git commit --allow-empty-message -m "" ' -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' ' |