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/t1309-early-config.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'third_party/git/t/t1309-early-config.sh') diff --git a/third_party/git/t/t1309-early-config.sh b/third_party/git/t/t1309-early-config.sh index ebb8e1aecbf4..0c37e7180d1c 100755 --- a/third_party/git/t/t1309-early-config.sh +++ b/third_party/git/t/t1309-early-config.sh @@ -29,7 +29,7 @@ test_expect_success 'ceiling' ' cd sub && test-tool config read_early_config early.config ) >output && - test_must_be_empty output + test -z "$(cat output)" ' test_expect_success 'ceiling #2' ' @@ -91,12 +91,7 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_expect_success 'early config and onbranch' ' echo "[broken" >broken && - test_with_config "[includeif \"onbranch:master\"]path=../broken" -' - -test_expect_success 'onbranch config outside of git repo' ' - test_config_global includeIf.onbranch:master.path non-existent && - nongit git help + test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../broken" ' test_done -- cgit 1.4.1