From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t5573-pull-verify-signatures.sh | 64 ----------------------- 1 file changed, 64 deletions(-) (limited to 'third_party/git/t/t5573-pull-verify-signatures.sh') diff --git a/third_party/git/t/t5573-pull-verify-signatures.sh b/third_party/git/t/t5573-pull-verify-signatures.sh index a53dd8550d0b..3e9876e19713 100755 --- a/third_party/git/t/t5573-pull-verify-signatures.sh +++ b/third_party/git/t/t5573-pull-verify-signatures.sh @@ -60,27 +60,6 @@ test_expect_success GPG 'pull commit with untrusted signature with --verify-sign test_i18ngrep "has an untrusted GPG signature" pullerror ' -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel ultimate && - test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel marginal && - test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel undefined && - git pull --ff-only --verify-signatures untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput -' - test_expect_success GPG 'pull signed commit with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && git pull --verify-signatures signed >pulloutput && @@ -100,53 +79,10 @@ test_expect_success GPG 'pull commit with bad signature with --no-verify-signatu ' test_expect_success GPG 'pull unsigned commit into unborn branch' ' - test_when_finished "rm -rf empty-repo" && git init empty-repo && test_must_fail \ git -C empty-repo pull --verify-signatures .. 2>pullerror && test_i18ngrep "does not have a GPG signature" pullerror ' -test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror && - test_i18ngrep "has a bad GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel ultimate && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel marginal && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel undefined && - git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput -' - test_done -- cgit 1.4.1