You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
486 B
34 lines
486 B
16 years ago
|
#!/bin/sh
|
||
|
|
|
||
|
|
test_description='test cherry-picking an empty commit'
|
||
|
|
|
||
|
|
. ./test-lib.sh
|
||
|
|
|
||
|
|
test_expect_success setup '
|
||
|
|
|
||
|
|
echo first > file1 &&
|
||
|
|
git add file1 &&
|
||
|
|
test_tick &&
|
||
|
|
git commit -m "first" &&
|
||
|
|
|
||
|
|
git checkout -b empty-branch &&
|
||
|
|
test_tick &&
|
||
|
|
git commit --allow-empty -m "empty"
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_code 1 'cherry-pick an empty commit' '
|
||
|
|
|
||
|
|
git checkout master &&
|
||
|
|
git cherry-pick empty-branch
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'index lockfile was removed' '
|
||
|
|
|
||
|
|
test ! -f .git/index.lock
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_done
|