From aeebd98ebe0fbd61f517d9da04f914c37ea0066b Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Wed, 7 Dec 2016 22:51:31 +0100 Subject: [PATCH] t3510: test that cherry-pick --abort does not unsafely change HEAD Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- t/t3510-cherry-pick-sequence.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 7b7a89dbd5..efcd4fc485 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -147,6 +147,16 @@ test_expect_success '--abort to cancel single cherry-pick' ' git diff-index --exit-code HEAD ' +test_expect_failure '--abort does not unsafely change HEAD' ' + pristine_detach initial && + test_must_fail git cherry-pick picked anotherpick && + git reset --hard base && + test_must_fail git cherry-pick picked anotherpick && + git cherry-pick --abort 2>actual && + test_i18ngrep "You seem to have moved HEAD" actual && + test_cmp_rev base HEAD +' + test_expect_success 'cherry-pick --abort to cancel multiple revert' ' pristine_detach anotherpick && test_expect_code 1 git revert base..picked &&