t7004-tag: Skip more tests if gpg is not available.

This test was already careful enough to skip signed tag tests if gpg
is not available, but it must also skip all verify tests, even those
that are about non-signed tags, because they also invoke gpg.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 75cd33bde8e5906ad68ecdcc904248745d79975c..1a7141ecd7ad1ffcd5081181548920b6a199ab2c 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -578,6 +578,14 @@ test_expect_success \
        git diff expect actual
 '
 
        git diff expect actual
 '
 

+# subsequent tests require gpg; check if it is available
+gpg --version >/dev/null
+if [ $? -eq 127 ]; then
+       echo "gpg not found - skipping tag signing and verification tests"
+       test_done
+       exit
+fi
+

 # trying to verify annotated non-signed tags:
 
 test_expect_success \
 # trying to verify annotated non-signed tags:
 
 test_expect_success \


@@ -600,13 +608,6 @@ test_expect_success \
 
 # creating and verifying signed tags:
 
 
 # creating and verifying signed tags:
 

-gpg --version >/dev/null
-if [ $? -eq 127 ]; then
-       echo "Skipping signed tags tests, because gpg was not found"
-       test_done
-       exit
-fi
-

 # 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.
 # 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.