diff options
Diffstat (limited to 'third_party/git/t/t7612-merge-verify-signatures.sh')
| -rwxr-xr-x | third_party/git/t/t7612-merge-verify-signatures.sh | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/third_party/git/t/t7612-merge-verify-signatures.sh b/third_party/git/t/t7612-merge-verify-signatures.sh index a426f3a89aa7..d99218a725c5 100755 --- a/third_party/git/t/t7612-merge-verify-signatures.sh +++ b/third_party/git/t/t7612-merge-verify-signatures.sh @@ -66,20 +66,6 @@ test_expect_success GPG 'merge commit with untrusted signature with verification test_i18ngrep "has an untrusted GPG signature" mergeerror ' -test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel marginal && - test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror && - test_i18ngrep "has an untrusted GPG signature" mergeerror -' - -test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel undefined && - git merge --ff-only --verify-signatures side-untrusted >mergeoutput && - test_i18ngrep "has a good GPG signature" mergeoutput -' - test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' ' test_when_finished "git reset --hard && git checkout initial" && test_config merge.verifySignatures true && @@ -87,14 +73,6 @@ test_expect_success GPG 'merge commit with untrusted signature with merge.verify test_i18ngrep "has an untrusted GPG signature" mergeerror ' -test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config merge.verifySignatures true && - test_config gpg.minTrustLevel marginal && - test_must_fail git merge --ff-only side-untrusted 2>mergeerror && - test_i18ngrep "has an untrusted GPG signature" mergeerror -' - test_expect_success GPG 'merge signed commit with verification' ' test_when_finished "git reset --hard && git checkout initial" && git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput && |