mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
c473af7396
|
@ -895,18 +895,16 @@ test_expect_success GPG 'verifying a forged tag should fail' '
|
||||||
test_must_fail git tag -v forged-tag
|
test_must_fail git tag -v forged-tag
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
|
test_expect_success GPG 'verifying a proper tag with --format pass and format accordingly' '
|
||||||
cat >expect <<-\EOF
|
cat >expect <<-\EOF &&
|
||||||
tagname : signed-tag
|
tagname : signed-tag
|
||||||
EOF &&
|
EOF
|
||||||
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
|
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
|
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
|
||||||
cat >expect <<-\EOF
|
>expect &&
|
||||||
tagname : forged-tag
|
|
||||||
EOF &&
|
|
||||||
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
|
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
|
@ -125,18 +125,16 @@ test_expect_success GPG 'verify multiple tags' '
|
||||||
test_cmp expect.stderr actual.stderr
|
test_cmp expect.stderr actual.stderr
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'verifying tag with --format' '
|
test_expect_success GPG 'verifying tag with --format' '
|
||||||
cat >expect <<-\EOF
|
cat >expect <<-\EOF &&
|
||||||
tagname : fourth-signed
|
tagname : fourth-signed
|
||||||
EOF &&
|
EOF
|
||||||
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
|
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
|
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
|
||||||
cat >expect <<-\EOF
|
>expect &&
|
||||||
tagname : 7th forged-signed
|
|
||||||
EOF &&
|
|
||||||
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
|
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
|
||||||
test_cmp expect actual-forged
|
test_cmp expect actual-forged
|
||||||
'
|
'
|
||||||
|
|
Loading…
Reference in a new issue