[PATCH v2 2/9] cherry-pick: add test for `--skip` advice in `git commit`
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Dec 6, 2019, 16:06 UTC
- Message-ID
- <20191206160614.631724-3-phillip.wood123@gmail.com>
- In-Reply-To
- <20191206160614.631724-1-phillip.wood123@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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> --- t/t3510-cherry-pick-sequence.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 793bcc7fe3..5b94fdaa67 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -123,7 +123,8 @@ test_expect_success 'revert --skip to skip commit' ' test_expect_success 'skip "empty" commit' ' pristine_detach picked && test_commit dummy foo d && - test_must_fail git cherry-pick anotherpick && + test_must_fail git cherry-pick anotherpick 2>err && + test_i18ngrep "git cherry-pick --skip" err && git cherry-pick --skip && test_cmp_rev dummy HEAD '
-- 2.24.0