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/t5607-clone-bundle.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'third_party/git/t/t5607-clone-bundle.sh') diff --git a/third_party/git/t/t5607-clone-bundle.sh b/third_party/git/t/t5607-clone-bundle.sh index 9108ff6fbd6f..2a0fb15cf175 100755 --- a/third_party/git/t/t5607-clone-bundle.sh +++ b/third_party/git/t/t5607-clone-bundle.sh @@ -64,7 +64,7 @@ test_expect_success 'ridiculously long subject in boundary' ' test -s heads && git fetch long-subject-bundle.bdl && sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary && - grep "^-$OID_REGEX " boundary + grep "^-[0-9a-f]\\{40\\} " boundary ' test_expect_success 'prerequisites with an empty commit message' ' @@ -83,15 +83,4 @@ test_expect_success 'failed bundle creation does not leave cruft' ' test_path_is_missing fail.bundle.lock ' -test_expect_success 'fetch SHA-1 from bundle' ' - test_create_repo foo && - test_commit -C foo x && - git -C foo bundle create tip.bundle -1 master && - git -C foo rev-parse HEAD >hash && - - # Exercise to ensure that fetching a SHA-1 from a bundle works with no - # errors - git fetch --no-tags foo/tip.bundle "$(cat hash)" -' - test_done -- cgit 1.4.1