Merge branch 'jc/grep-c' into maint

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index c4fa4461f764dd936f231dae3905605b0ed0c28a..0d07bc39c745ade65370dde35f43f16a37231179 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -185,18 +185,17 @@ cba
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
-       git-tag -l a > actual &&
+       git-tag -l "*a*" > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
 v0.2.1
 v1.0.1
-v1.1.3
 EOF
 test_expect_success \
-       'listing tags with substring as pattern must print those matching' '
-       git-tag -l .1 > actual &&
+       'listing tags with a suffix as pattern must print those matching' '
+       git-tag -l "*.1" > actual &&
        git diff expect actual
 '
 
@@ -205,37 +204,36 @@ t210
 t211
 EOF
 test_expect_success \
-       'listing tags with substring as pattern must print those matching' '
-       git-tag -l t21 > actual &&
+       'listing tags with a prefix as pattern must print those matching' '
+       git-tag -l "t21*" > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
 a1
-aa1
 EOF
 test_expect_success \
-       'listing tags using a name as pattern must print those matching' '
+       'listing tags using a name as pattern must print that one matching' '
        git-tag -l a1 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
 v1.0
-v1.0.1
 EOF
 test_expect_success \
-       'listing tags using a name as pattern must print those matching' '
+       'listing tags using a name as pattern must print that one matching' '
        git-tag -l v1.0 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
+v1.0.1
 v1.1.3
 EOF
 test_expect_success \
        'listing tags with ? in the pattern should print those matching' '
-       git-tag -l "1.1?" > actual &&
+       git-tag -l "v1.?.?" > actual &&
        git diff expect actual
 '
 
@@ -992,6 +990,13 @@ test_expect_success \
        git diff expect actual
 '
 
+# try to sign with bad user.signingkey
+git config user.signingkey BobTheMouse
+test_expect_failure \
+       'git-tag -s fails if gpg is misconfigured' \
+       'git tag -s -m tail tag-gpg-failure'
+git config --unset user.signingkey
+
 # try to verify without gpg:
 
 rm -rf gpghome