summaryrefslogtreecommitdiff
path: root/t/t1600-index.sh
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2014-02-23 21:49:59 +0100
committerJunio C Hamano <gitster@pobox.com>2014-02-24 13:33:17 -0800
commit3c09d6845d253f9d8a75f3a36278c69e01b073e9 (patch)
tree3791637a413e81432101ab613f352edd9e57f221 /t/t1600-index.sh
parent5d9fc888b485caa1b6a95f2cb583dc26ab7e8d13 (diff)
downloadgit-3c09d6845d253f9d8a75f3a36278c69e01b073e9.tar.gz
read-cache: add index.version config variabletg/index-v4-format
Add a config variable that allows setting the default index version when initializing a new index file. Similar to the GIT_INDEX_VERSION environment variable this only affects new index files. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1600-index.sh')
-rwxr-xr-xt/t1600-index.sh27
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 6195c55702..079d241145 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -46,4 +46,31 @@ test_expect_success 'no warning with bogus GIT_INDEX_VERSION and existing index'
)
'
+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_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
+ (
+ rm -f .git/index &&
+ GIT_INDEX_VERSION=4 &&
+ export GIT_INDEX_VERSION &&
+ git config --add index.version 2 &&
+ git add a 2>&1 &&
+ echo 4 >expect &&
+ test-index-version <.git/index >actual &&
+ test_cmp expect actual
+ )
+'
+
test_done