2009-03-07 09:30:51 +00:00
|
|
|
#!/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 &&
|
2010-07-22 13:18:29 +00:00
|
|
|
git commit --allow-empty -m "empty" &&
|
|
|
|
|
|
|
|
echo third >> file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
test_tick &&
|
2012-04-20 14:36:16 +00:00
|
|
|
git commit --allow-empty-message -m "" &&
|
|
|
|
|
|
|
|
git checkout master &&
|
|
|
|
git checkout -b empty-branch2 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit --allow-empty -m "empty"
|
2009-03-07 09:30:51 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-06-21 09:01:28 +00:00
|
|
|
test_expect_success 'cherry-pick an empty commit' '
|
2010-07-22 13:18:29 +00:00
|
|
|
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 a commit with an empty message' '
|
2009-06-21 09:01:28 +00:00
|
|
|
git checkout master && {
|
|
|
|
git cherry-pick empty-branch
|
|
|
|
test "$?" = 1
|
|
|
|
}
|
2009-03-07 09:30:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'index lockfile was removed' '
|
|
|
|
|
|
|
|
test ! -f .git/index.lock
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2012-04-20 14:36:16 +00:00
|
|
|
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^
|
|
|
|
'
|
|
|
|
|
2009-03-07 09:30:51 +00:00
|
|
|
test_done
|