diff options
Diffstat (limited to 'third_party/git/t/t3510-cherry-pick-sequence.sh')
| -rwxr-xr-x | third_party/git/t/t3510-cherry-pick-sequence.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/git/t/t3510-cherry-pick-sequence.sh b/third_party/git/t/t3510-cherry-pick-sequence.sh index 793bcc7fe3..5b94fdaa67 100755 --- a/third_party/git/t/t3510-cherry-pick-sequence.sh +++ b/third_party/git/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 ' |