subtree: improve decision on merges kept in split

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 44288cbb598435a5dfff05e8e895cca85e53e804..3f95bfda605f7ad1f9b0b0385ffdc91e5cca415e 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1083,6 +1083,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 &&