git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b7a64d)
cherry-pick: check commit error messages
authorPhillip Wood <redacted>
Fri, 6 Dec 2019 16:06:08 +0000 (16:06 +0000)
committerJunio C Hamano <redacted>
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t3507-cherry-pick-conflict.sh diff | blob | history
git clone https://git.99rst.org/PROJECT