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/t5516-fetch-push.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/t5516-fetch-push.sh')
| -rwxr-xr-x | third_party/git/t/t5516-fetch-push.sh | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/third_party/git/t/t5516-fetch-push.sh b/third_party/git/t/t5516-fetch-push.sh index 9ff041a093e7..c81ca360ac4a 100755 --- a/third_party/git/t/t5516-fetch-push.sh +++ b/third_party/git/t/t5516-fetch-push.sh @@ -1151,7 +1151,7 @@ test_expect_success 'fetch exact SHA1' ' # unadvertised objects, so restrict this test to v0. # fetching the hidden object should fail by default - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err && test_must_fail git rev-parse --verify refs/heads/copy && @@ -1210,7 +1210,7 @@ do cd shallow && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch --depth=1 ../testrepo/.git $SHA1 && git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true && git fetch --depth=1 ../testrepo/.git $SHA1 && @@ -1241,9 +1241,9 @@ do cd shallow && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_3 && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_1 && git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true && git fetch ../testrepo/.git $SHA1_1 && @@ -1251,7 +1251,7 @@ do test_must_fail git cat-file commit $SHA1_2 && git fetch ../testrepo/.git $SHA1_2 && git cat-file commit $SHA1_2 && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_3 2>err && test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err ) @@ -1291,7 +1291,7 @@ test_expect_success 'peeled advertisements are not considered ref tips' ' git -C testrepo commit --allow-empty -m two && git -C testrepo tag -m foo mytag HEAD^ && oid=$(git -C testrepo rev-parse mytag^{commit}) && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch testrepo $oid 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err ' @@ -1712,15 +1712,4 @@ test_expect_success 'updateInstead with push-to-checkout hook' ' ) ' -test_expect_success 'denyCurrentBranch and worktrees' ' - git worktree add new-wt && - git clone . cloned && - test_commit -C cloned first && - test_config receive.denyCurrentBranch refuse && - test_must_fail git -C cloned push origin HEAD:new-wt && - test_config receive.denyCurrentBranch updateInstead && - git -C cloned push origin HEAD:new-wt && - test_must_fail git -C cloned push --delete origin new-wt -' - test_done |