diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:20 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:20 +0900 |
| commit | 62c0fd46a875050e904831a73ef4375ed26cfaf6 (patch) | |
| tree | 9bb09418c52e02a93f55c62826574ad26ac20f5b /t/t3404-rebase-interactive.sh | |
| parent | The first batch for 2.18 cycle (diff) | |
| parent | parse-options: do not show usage upon invalid option value (diff) | |
| download | tgif-62c0fd46a875050e904831a73ef4375ed26cfaf6.tar.xz | |
Merge branch 'ps/contains-id-error-message'
"git tag --contains no-such-commit" gave a full list of options
after giving an error message.
* ps/contains-id-error-message:
parse-options: do not show usage upon invalid option value
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3b905406df..c59d0384fd 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -927,10 +927,8 @@ test_expect_success 'rebase --exec works without -i ' ' test_expect_success 'rebase -i --exec without <CMD>' ' git reset --hard execute && set_fake_editor && - test_must_fail git rebase -i --exec 2>tmp && - sed -e "1d" tmp >actual && - test_must_fail git rebase -h >expected && - test_cmp expected actual && + test_must_fail git rebase -i --exec 2>actual && + test_i18ngrep "requires a value" actual && git checkout master ' |