mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
bedfe86ce6
Since we've added the --allow-empty and --keep-redundant-commits options to git cherry-pick we should also add a test to ensure that its working properly. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.4 KiB
Bash
Executable file
75 lines
1.4 KiB
Bash
Executable file
#!/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" &&
|
|
|
|
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_success 'cherry-pick an empty commit' '
|
|
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' '
|
|
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
|