read-cache: update TEST_GIT_INDEX_VERSION support

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 653688c067406faa961b0d6967f531ec7d7ba030..e80c84d13c398303681597450f7c8416a3aa44f5 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -134,12 +134,6 @@ export EDITOR
 GIT_TRACE_BARE=1
 export GIT_TRACE_BARE
 
-if test -n "${TEST_GIT_INDEX_VERSION:+isset}"
-then
-       GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"
-       export GIT_INDEX_VERSION
-fi
-
 check_var_migration () {
        old_name=$1 new_name=$2
        eval "old_isset=\${${old_name}:+isset}"
@@ -159,6 +153,14 @@ check_var_migration () {
 }
 
 check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
+check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
+
+# Use specific version of the index file format
+if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
+then
+       GIT_INDEX_VERSION="$GIT_TEST_INDEX_VERSION"
+       export GIT_INDEX_VERSION
+fi
 
 # Add libc MALLOC and MALLOC_PERTURB test
 # only if we are not executing the test with valgrind