diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-11 15:06:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 09:54:25 -0700 |
| commit | 21246dbb9e0af278bc671e32e45a6cae4ad38b6f (patch) | |
| tree | 189bf00464a90b6bbd13efa2a186faccb17fe904 /t/t3508-cherry-pick-many-commits.sh | |
| parent | fa7285dc3dce8bd01fd8c665b032603ed55348e5 (diff) | |
| download | git-21246dbb9e0af278bc671e32e45a6cae4ad38b6f.tar.gz | |
cherry-pick: make sure all input objects are commits
When a single argument was a non-commit, the error message used to be:
fatal: BUG: expected exactly one commit from walk
For multiple arguments, when none of the arguments was a commit, the error was:
fatal: empty commit set passed
Finally, when some of the arguments were non-commits, we ignored those
arguments. Fix this bug and make sure all arguments are commits, and
for the first non-commit, error out with:
fatal: <name>: Can't cherry-pick a <type>
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3508-cherry-pick-many-commits.sh')
| -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 |