diff options
| author |  Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com> | 2018-03-22 20:43:51 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-22 12:10:08 -0700 |
| commit | 3bb0923f06c55ea44569f547cefa9e1a59069ff2 (patch) | |
| tree | 9667154be2d13f516298897c4b132191db38b6f4 /t/t3404-rebase-interactive.sh | |
| parent | Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint (diff) | |
| download | tgif-3bb0923f06c55ea44569f547cefa9e1a59069ff2.tar.xz | |
parse-options: do not show usage upon invalid option value
Usually, the usage should be shown only if the user does not know what
options are available. If the user specifies an invalid value, the user
is already aware of the available options. In this case, there is no
point in displaying the usage anymore.
This patch applies to "git tag --contains", "git branch --contains",
"git branch --points-at", "git for-each-ref --contains" and many more.
Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 481a350090..3216707df7 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -915,10 +915,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 ' |