From: Jan Palus <jan.palus@xxxxxxxxx>
These all came as part of an earlier st/verify-tag topic that was
merged to 2.12.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* This should be applied on top of 4fea72f4 ("t/t7004-tag: Add
--format specifier tests", 2017-01-17)
t/t7004-tag.sh | 8 ++++----
t/t7030-verify-tag.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index b4698ab5f5..efc6dde7b8 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -896,17 +896,17 @@ test_expect_success GPG 'verifying a forged tag should fail' '
'
test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
- cat >expect <<-\EOF
+ 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
+ cat >expect <<-\EOF &&
tagname : forged-tag
- EOF &&
+ EOF
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
test_cmp expect actual
'
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index d62ccbb98e..ce37fd9864 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -126,17 +126,17 @@ test_expect_success GPG 'verify multiple tags' '
'
test_expect_success 'verifying tag with --format' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : fourth-signed
- EOF &&
+ EOF
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
test_cmp expect actual
'
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : 7th forged-signed
- EOF &&
+ EOF
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
test_cmp expect actual-forged
'
--
2.12.1-430-gafd6726309