about summary refs log tree commit diff
path: root/third_party/git/t/t1305-config-include.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t1305-config-include.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (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/t1305-config-include.sh')
-rwxr-xr-xthird_party/git/t/t1305-config-include.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t1305-config-include.sh b/third_party/git/t/t1305-config-include.sh
index f1e1b289f9..d20b4d150d 100755
--- a/third_party/git/t/t1305-config-include.sh
+++ b/third_party/git/t/t1305-config-include.sh
@@ -63,7 +63,7 @@ test_expect_success 'listing includes option and expansion' '
 	test.one=1
 	EOF
 	git config --list >actual.full &&
-	grep -v -e ^core -e ^extensions actual.full >actual &&
+	grep -v ^core actual.full >actual &&
 	test_cmp expect actual
 '