about summary refs log tree commit diff
path: root/third_party/git/t/t1600-index.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/t1600-index.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/t1600-index.sh')
-rwxr-xr-xthird_party/git/t/t1600-index.sh35
1 files changed, 5 insertions, 30 deletions
diff --git a/third_party/git/t/t1600-index.sh b/third_party/git/t/t1600-index.sh
index b7c31aa86a11..42962ed7d46f 100755
--- a/third_party/git/t/t1600-index.sh
+++ b/third_party/git/t/t1600-index.sh
@@ -59,42 +59,17 @@ test_expect_success 'out of bounds index.version issues warning' '
 	)
 '
 
-test_index_version () {
-	INDEX_VERSION_CONFIG=$1 &&
-	FEATURE_MANY_FILES=$2 &&
-	ENV_VAR_VERSION=$3
-	EXPECTED_OUTPUT_VERSION=$4 &&
+test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
 	(
 		rm -f .git/index &&
-		rm -f .git/config &&
-		if test "$INDEX_VERSION_CONFIG" -ne 0
-		then
-			git config --add index.version $INDEX_VERSION_CONFIG
-		fi &&
-		git config --add feature.manyFiles $FEATURE_MANY_FILES
-		if test "$ENV_VAR_VERSION" -ne 0
-		then
-			GIT_INDEX_VERSION=$ENV_VAR_VERSION &&
-			export GIT_INDEX_VERSION
-		else
-			unset GIT_INDEX_VERSION
-		fi &&
+		GIT_INDEX_VERSION=4 &&
+		export GIT_INDEX_VERSION &&
+		git config --add index.version 2 &&
 		git add a 2>&1 &&
-		echo $EXPECTED_OUTPUT_VERSION >expect &&
+		echo 4 >expect &&
 		test-tool index-version <.git/index >actual &&
 		test_cmp expect actual
 	)
-}
-
-test_expect_success 'index version config precedence' '
-	test_index_version 0 false 0 2 &&
-	test_index_version 2 false 0 2 &&
-	test_index_version 3 false 0 2 &&
-	test_index_version 4 false 0 4 &&
-	test_index_version 2 false 4 4 &&
-	test_index_version 2 true 0 2 &&
-	test_index_version 0 true 0 4 &&
-	test_index_version 0 true 2 2
 '
 
 test_done