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/t5150-request-pull.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'third_party/git/t/t5150-request-pull.sh') diff --git a/third_party/git/t/t5150-request-pull.sh b/third_party/git/t/t5150-request-pull.sh index c1811ea0f412..852dcd913f1e 100755 --- a/third_party/git/t/t5150-request-pull.sh +++ b/third_party/git/t/t5150-request-pull.sh @@ -4,12 +4,6 @@ test_description='Test workflows involving pull request.' . ./test-lib.sh -if ! test_have_prereq PERL -then - skip_all='skipping request-pull tests, perl not available' - test_done -fi - test_expect_success 'setup' ' git init --bare upstream.git && @@ -150,6 +144,7 @@ test_expect_success 'pull request after push' ' git request-pull initial origin master:for-upstream >../request ) && sed -nf read-request.sed digest && + cat digest && { read task && read repository && @@ -178,6 +173,7 @@ test_expect_success 'request asks HEAD to be pulled' ' git request-pull initial "$downstream_url" >../request ) && sed -nf read-request.sed digest && + cat digest && { read task && read repository && -- cgit 1.4.1