kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-cherry-pick: Add test to validate new options 

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>
maint
Neil Horman 2012-04-20 10:36:16 -04:00 committed by Junio C Hamano
parent b27cfb0d8d
commit bedfe86ce6
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
t/t3505-cherry-pick-empty.sh
View File

@ -18,7 +18,12 @@ test_expect_success setup '
echo third >> file1 &&
git add file1 &&
test_tick &&
git commit --allow-empty-message -m ""
git commit --allow-empty-message -m "" &&

git checkout master &&
git checkout -b empty-branch2 &&
test_tick &&
git commit --allow-empty -m "empty"

'

@ -48,4 +53,22 @@ test_expect_success 'index lockfile was removed' '

'

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