diff options
Diffstat (limited to 'third_party/git/t/t1600-index.sh')
| -rwxr-xr-x | third_party/git/t/t1600-index.sh | 35 |
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 |