summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
commit06938a37dca9bb19784c1bd41e90c99a7c8f8e5e (patch)
tree25be5b409d7bba815b9e99abc2ccdb4a0230ed2c /t
parenta8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (diff)
parent67ac1e1d57e45899a4dfd900a0249f48507584b5 (diff)
downloadgit-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.zip
git-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.tar.gz
git-06938a37dca9bb19784c1bd41e90c99a7c8f8e5e.tar.bz2
Merge branch 'jn/cherry-pick-strategy-option'
* jn/cherry-pick-strategy-option: cherry-pick/revert: add support for -X/--strategy-option
Diffstat (limited to 't')
-rwxr-xr-xt/t3032-merge-recursive-options.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 44f5421..2b17311 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -110,6 +110,20 @@ test_expect_success '--ignore-space-change makes merge succeed' '
git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
'
+test_expect_success 'naive cherry-pick fails' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git cherry-pick --no-commit remote &&
+ git read-tree --reset -u HEAD &&
+ test_must_fail git cherry-pick remote &&
+ test_must_fail git update-index --refresh &&
+ grep "<<<<<<" text.txt
+'
+
+test_expect_success '-Xignore-space-change makes cherry-pick succeed' '
+ git read-tree --reset -u HEAD &&
+ git cherry-pick --no-commit -Xignore-space-change remote
+'
+
test_expect_success '--ignore-space-change: our w/s-only change wins' '
q_to_cr <<-\EOF >expected &&
justice and holiness and is the nurse of his age and theQ