Merge branch 'np/log-graph-octopus-fix'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 653688c067406faa961b0d6967f531ec7d7ba030..897e6fcc94a195bd8b4493deee411ba9c6ba9f15 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -134,16 +134,18 @@ 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 () {
+       # the warnings and hints given from this helper depends
+       # on end-user settings, which will disrupt the self-test
+       # done on the test framework itself.
+       case "$GIT_TEST_FRAMEWORK_SELFTEST" in
+       t)      return ;;
+       esac
+
        old_name=$1 new_name=$2
        eval "old_isset=\${${old_name}:+isset}"
        eval "new_isset=\${${new_name}:+isset}"
+
        case "$old_isset,$new_isset" in
        isset,)
                echo >&2 "warning: $old_name is now $new_name"
@@ -159,6 +161,15 @@ check_var_migration () {
 }
 
 check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
+check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
+check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX
+
+# 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
@@ -1103,6 +1114,12 @@ else
        test_set_prereq C_LOCALE_OUTPUT
 fi
 
+if test -z "$GIT_TEST_CHECK_CACHE_TREE"
+then
+       GIT_TEST_CHECK_CACHE_TREE=true
+       export GIT_TEST_CHECK_CACHE_TREE
+fi
+
 test_lazy_prereq PIPE '
        # test whether the filesystem supports FIFOs
        test_have_prereq !MINGW,!CYGWIN &&