From 3bb0923f06c55ea44569f547cefa9e1a59069ff2 Mon Sep 17 00:00:00 2001 From: Paul-Sebastian Ungureanu Date: Thu, 22 Mar 2018 20:43:51 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3404-rebase-interactive.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 't/t3404-rebase-interactive.sh') 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 ' ' 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 ' -- cgit v1.2.3