summaryrefslogtreecommitdiff
path: root/t/t7004-tag.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:23 (GMT)
commitc473af7396b9d5ac39d1164434788fef6da80919 (patch)
tree3b3a7250eaf2273e440da7ada4d7a54afc7fb0b8 /t/t7004-tag.sh
parent980ee776383cacdf77dd79667daa2efcb0b5882d (diff)
parentb42ca35e5c4f792810c08e95676ba63976f4cd02 (diff)
downloadgit-c473af7396b9d5ac39d1164434788fef6da80919.zip
git-c473af7396b9d5ac39d1164434788fef6da80919.tar.gz
git-c473af7396b9d5ac39d1164434788fef6da80919.tar.bz2
Merge branch 'st/verify-tag'
A few unterminated here documents in tests were fixed, which in turn revealed incorrect expectations the tests make. These tests have been updated. * st/verify-tag: t7004, t7030: fix here-doc syntax errors
Diffstat (limited to 't/t7004-tag.sh')
-rwxr-xr-xt/t7004-tag.sh12
1 files changed, 5 insertions, 7 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index b4698ab..772dc9e 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -895,18 +895,16 @@ test_expect_success GPG 'verifying a forged tag should fail' '
test_must_fail git tag -v forged-tag
'
-test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
- cat >expect <<-\EOF
+test_expect_success GPG 'verifying a proper tag with --format pass and format accordingly' '
+ cat >expect <<-\EOF &&
tagname : signed-tag
- EOF &&
+ EOF
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
test_cmp expect actual
'
-test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
- cat >expect <<-\EOF
- tagname : forged-tag
- EOF &&
+test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
+ >expect &&
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
test_cmp expect actual
'