From: Neil Horman Date: Fri, 13 Apr 2012 18:45:06 GMT Subject: [PATCH v5 3/4] git-cherry-pick: Add test to validate new options Message-ID: <1334342707-3326-4-git-send-email-nhorman@tuxdriver.com> In-Reply-To: <1334342707-3326-1-git-send-email-nhorman@tuxdriver.com> 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 --- t/t3505-cherry-pick-empty.sh | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index c10b28c..5e3ad65 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -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,25 @@ 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 -- 1.7.7.6