]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b7a64d) | patch
cherry-pick: check commit error messages
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Fri, 6 Dec 2019 16:06:08 +0000 (16:06 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Dec 2019 17:32:01 +0000 (09:32 -0800)
commitf028d661c74f29de0e26494e6c9fbcf186b0d4ae
tree144278d621733bd2236c6bf0e7c9bd8ecac151cetree | snapshot
parent5b7a64df40bec755b0d9ef477764e45ba72abf7bcommit | diff
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>
t/t3507-cherry-pick-conflict.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.