diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-19 13:40:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-19 13:40:23 -0700 |
| commit | 4407ea49fe47e90953f187279d55eb93f89a3530 (patch) | |
| tree | 14c847d0a6b6f48ef68c1c7ebfcb94f29238bf94 /t | |
| parent | 8d41addacbf210038f929dfad4b0c7829392366c (diff) | |
| parent | 21246dbb9e0af278bc671e32e45a6cae4ad38b6f (diff) | |
| download | git-4407ea49fe47e90953f187279d55eb93f89a3530.tar.gz | |
Merge branch 'mv/sequencer-pick-error-diag'
"git cherry-pick $blob $tree" is diagnosed as a nonsense.
* mv/sequencer-pick-error-diag:
cherry-pick: make sure all input objects are commits
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 4e7136b837..19c99d7ef1 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -55,6 +55,12 @@ one two" ' +test_expect_success 'cherry-pick three one two: fails' ' + git checkout -f master && + git reset --hard first && + test_must_fail git cherry-pick three one two: +' + test_expect_success 'output to keep user entertained during multi-pick' ' cat <<-\EOF >expected && [master OBJID] second |