diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 13:44:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-03 01:16:09 +0300 |
| commit | f826fb799ed06f2f9537466f6988bcabd1200ebd (patch) | |
| tree | 5421f270d921c087eebe4f5d5b55309c13dfc941 /t/t3504-cherry-pick-rerere.sh | |
| parent | 8d8cb4b047cef546ea80b8224c7b33707f6d6a4c (diff) | |
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick and revert should not accept --[no-]rerere-autoupdate once
they have started.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3504-cherry-pick-rerere.sh')
| -rwxr-xr-x | t/t3504-cherry-pick-rerere.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh index af316cb40b..a267b2d144 100755 --- a/t/t3504-cherry-pick-rerere.sh +++ b/t/t3504-cherry-pick-rerere.sh @@ -65,6 +65,19 @@ test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' ' git reset --hard bar-dev ' +test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' ' + test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master && + test_cmp foo-expect foo && + git diff-files --quiet && + test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 && + echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect && + test_i18ncmp expect actual && + test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 && + echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect && + test_i18ncmp expect actual && + git cherry-pick --abort +' + test_expect_success 'cherry-pick --rerere-autoupdate more than once' ' test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master && test_cmp foo-expect foo && |