diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t7030-verify-tag.sh | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t7030-verify-tag.sh')
-rwxr-xr-x | third_party/git/t/t7030-verify-tag.sh | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/third_party/git/t/t7030-verify-tag.sh b/third_party/git/t/t7030-verify-tag.sh index 5c5bc32ccb13..041e319e79aa 100755 --- a/third_party/git/t/t7030-verify-tag.sh +++ b/third_party/git/t/t7030-verify-tag.sh @@ -44,8 +44,8 @@ test_expect_success GPG 'create signed tags' ' test_expect_success GPGSM 'create signed tags x509 ' ' test_config gpg.format x509 && test_config user.signingkey $GIT_COMMITTER_EMAIL && - echo 9 >file && test_tick && git commit -a -m "ninth gpgsm-signed" && - git tag -s -m ninth ninth-signed-x509 + echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" && + git tag -s -m nineth nineth-signed-x509 ' test_expect_success GPG 'verify and show signatures' ' @@ -80,34 +80,10 @@ test_expect_success GPG 'verify and show signatures' ' ' test_expect_success GPGSM 'verify and show signatures x509' ' - git verify-tag ninth-signed-x509 2>actual && + git verify-tag nineth-signed-x509 2>actual && grep "Good signature from" actual && ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with low minTrustLevel' ' - test_config gpg.minTrustLevel undefined && - git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with matching minTrustLevel' ' - test_config gpg.minTrustLevel fully && - git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with high minTrustLevel' ' - test_config gpg.minTrustLevel ultimate && - test_must_fail git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK + echo nineth-signed-x509 OK ' test_expect_success GPG 'detect fudged signature' ' @@ -151,10 +127,10 @@ test_expect_success GPG 'verify signatures with --raw' ' ' test_expect_success GPGSM 'verify signatures with --raw x509' ' - git verify-tag --raw ninth-signed-x509 2>actual && + git verify-tag --raw nineth-signed-x509 2>actual && grep "GOODSIG" actual && ! grep "BADSIG" actual && - echo ninth-signed-x509 OK + echo nineth-signed-x509 OK ' test_expect_success GPG 'verify multiple tags' ' @@ -171,7 +147,7 @@ test_expect_success GPG 'verify multiple tags' ' ' test_expect_success GPGSM 'verify multiple tags x509' ' - tags="seventh-signed ninth-signed-x509" && + tags="seventh-signed nineth-signed-x509" && for i in $tags do git verify-tag -v --raw $i || return 1 |