Merge branch 'js/windows-tests'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 69501e2711f26a7c498d545520dcf47c00d9b1e1..1c27ffb45effdafaace54a29c3ce63f07d6899e6 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -185,8 +185,9 @@ cba
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
-       git tag -l "*a*" > actual &&
-       test_cmp expect actual
+       rm *a* &&
+       git tag -l "*a*" > current &&
+       test_cmp expect current
 '
 
 cat >expect <<EOF
@@ -582,7 +583,7 @@ test_expect_success \
 # 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"
+       say "gpg not found - skipping tag signing and verification tests"
        test_done
        exit
 fi
@@ -614,7 +615,7 @@ test_expect_success \
 # that version, creation of signed tags using the generated key fails.
 case "$(gpg --version)" in
 'gpg (GnuPG) 1.0.6'*)
-       echo "Skipping signed tag tests, because a bug in 1.0.6 version"
+       say "Skipping signed tag tests, because a bug in 1.0.6 version"
        test_done
        exit
        ;;