diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-12-06 17:06:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-06 18:32:01 +0100 |
| commit | f028d661c74f29de0e26494e6c9fbcf186b0d4ae (patch) | |
| tree | 144278d621733bd2236c6bf0e7c9bd8ecac151ce | |
| parent | cherry-pick: add test for `--skip` advice in `git commit` (diff) | |
| download | git-f028d661c74f29de0e26494e6c9fbcf186b0d4ae.tar.xz git-f028d661c74f29de0e26494e6c9fbcf186b0d4ae.zip | |
cherry-pick: check commit error messages
We disallow partial commits and amending when CHERRY_PICK_HEAD
exists. Add a couple of tests to check the error message printed in each
case before we refactor the code responsible for this.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 9b9b4ca8d4..c9715bf674 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -161,6 +161,29 @@ test_expect_success 'successful commit clears CHERRY_PICK_HEAD' ' test_must_fail git rev-parse --verify CHERRY_PICK_HEAD ' + +test_expect_success 'partial commit of cherry-pick fails' ' + pristine_detach initial && + + test_must_fail git cherry-pick picked && + echo resolved >foo && + git add foo && + test_must_fail git commit foo 2>err && + + test_i18ngrep "cannot do a partial commit during a cherry-pick." err +' + +test_expect_success 'commit --amend of cherry-pick fails' ' + pristine_detach initial && + + test_must_fail git cherry-pick picked && + echo resolved >foo && + git add foo && + test_must_fail git commit --amend 2>err && + + test_i18ngrep "in the middle of a cherry-pick -- cannot amend." err +' + test_expect_success 'successful final commit clears cherry-pick state' ' pristine_detach initial && |