[PATCH v2 1/4] lib-gpg: drop unnecessary "missing GPG" warning
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 7, 2016, 00:10 UTC
- Message-ID
- <1457309427-30124-2-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1457309427-30124-1-git-send-email-sunshine@sunshineco.com>
When 37d3e85 (t7004: factor out gpg setup, 2011-09-07) pulled gpg detection code out of t7004-tag.sh and turned it into a standard test prerequisite, it added an unconditional "missing GPG" warning when gpg is not detected.
However, this is redundant since all tests which require GPG already warn via either 'test_expect_success GPG' ("skipping: missing GPG") on a test-by-test basis, or when skipping all tests in a script ("skipping all foobar tests; missing GPG"). Consequently, the extra warning from lib-gpg.sh is unnecessary, so retire it.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
At first I found this warning alarming and then annoying when changing t6302 to skip only signed tag testing (rather than skipping all tests entirely). It does seem like a redundant warning, hence this patch...
I also sneaked in a minor style cleanup.
t/lib-gpg.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index db2ef22..ec2aa8f 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -1,9 +1,8 @@ #!/bin/sh gpg_version=$(gpg --version 2>&1) -if test $? = 127; then - say "You do not seem to have gpg installed" -else +if test $? != 127 +then # As said here: http://www.gnupg.org/documentation/faqs.html#q6.19 # the gpg version 1.0.6 didn't parse trust packets correctly, so for # that version, creation of signed tags using the generated key fails.
-- 2.8.0.rc1.175.g19dcece