summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 16:06:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-06 17:32:01 (GMT)
commit5b7a64df40bec755b0d9ef477764e45ba72abf7b (patch)
tree040356b766059a1b153b5848dac8e2c4557cc9de /t/t3507-cherry-pick-conflict.sh
parent780308d060b2756ed52913ad2c1328c0d7049c05 (diff)
downloadgit-5b7a64df40bec755b0d9ef477764e45ba72abf7b.zip
git-5b7a64df40bec755b0d9ef477764e45ba72abf7b.tar.gz
git-5b7a64df40bec755b0d9ef477764e45ba72abf7b.tar.bz2
cherry-pick: add test for `--skip` advice in `git commit`
In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), `git commit` learned to suggest to run `git cherry-pick --skip` when trying to cherry-pick an empty patch, but that was never tested for. Here is a test that verifies that a message is given to the user that contains the correct invocation. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions