mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
c11e9966cb
Several config options were combined into a repo_settings struct in
ds/feature-macros, including a move of the "index.version" config
setting in 7211b9e (repo-settings: consolidate some config settings,
2019-08-13).
Unfortunately, that file looked like a lot of boilerplate and what is
clearly a factor of copy-paste overload, the config setting is parsed
with repo_config_ge_bool() instead of repo_config_get_int(). This means
that a setting "index.version=4" would not register correctly and would
revert to the default version of 3.
I caught this while incorporating v2.24.0-rc0 into the VFS for Git
codebase, where we really care that the index is in version 4.
This was not caught by the codebase because the version checks placed
in t1600-index.sh did not test the "basic" scenario enough. Here, we
modify the test to include these normal settings to not be overridden by
features.manyFiles or GIT_INDEX_VERSION. While the "default" version is
3, this is demoted to version 2 in do_write_index() when not necessary.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
101 lines
2.4 KiB
Bash
Executable File
101 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='index file specific tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo 1 >a
|
|
'
|
|
|
|
test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
|
|
(
|
|
rm -f .git/index &&
|
|
GIT_INDEX_VERSION=2bogus &&
|
|
export GIT_INDEX_VERSION &&
|
|
git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
|
|
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
|
|
warning: GIT_INDEX_VERSION set, but the value is invalid.
|
|
Using version Z
|
|
EOF
|
|
test_i18ncmp expect.err actual.err
|
|
)
|
|
'
|
|
|
|
test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
|
|
(
|
|
rm -f .git/index &&
|
|
GIT_INDEX_VERSION=1 &&
|
|
export GIT_INDEX_VERSION &&
|
|
git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
|
|
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
|
|
warning: GIT_INDEX_VERSION set, but the value is invalid.
|
|
Using version Z
|
|
EOF
|
|
test_i18ncmp expect.err actual.err
|
|
)
|
|
'
|
|
|
|
test_expect_success 'no warning with bogus GIT_INDEX_VERSION and existing index' '
|
|
(
|
|
GIT_INDEX_VERSION=1 &&
|
|
export GIT_INDEX_VERSION &&
|
|
git add a 2>actual.err &&
|
|
test_must_be_empty actual.err
|
|
)
|
|
'
|
|
|
|
test_expect_success 'out of bounds index.version issues warning' '
|
|
(
|
|
sane_unset GIT_INDEX_VERSION &&
|
|
rm -f .git/index &&
|
|
git config --add index.version 1 &&
|
|
git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
|
|
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
|
|
warning: index.version set, but the value is invalid.
|
|
Using version Z
|
|
EOF
|
|
test_i18ncmp expect.err actual.err
|
|
)
|
|
'
|
|
|
|
test_index_version () {
|
|
INDEX_VERSION_CONFIG=$1 &&
|
|
FEATURE_MANY_FILES=$2 &&
|
|
ENV_VAR_VERSION=$3
|
|
EXPECTED_OUTPUT_VERSION=$4 &&
|
|
(
|
|
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 add a 2>&1 &&
|
|
echo $EXPECTED_OUTPUT_VERSION >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
|