Merge branch 'jt/avoid-ls-refs'

diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 8e17f8e7a043fa38c14f94193df2f79fc2139cd1..3e618cad120f9cf692a1bc90d27d9c7ddb570135 100755 (executable)
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -6,7 +6,12 @@ test_description='split index mode tests'
 
 # We need total control of index splitting here
 sane_unset GIT_TEST_SPLIT_INDEX
-sane_unset GIT_FSMONITOR_TEST
+
+# Testing a hard coded SHA against an index with an extension
+# that can vary from run to run is problematic so we disable
+# those extensions.
+sane_unset GIT_TEST_FSMONITOR
+sane_unset GIT_TEST_INDEX_THREADS
 
 test_expect_success 'enable split index' '
        git config splitIndex.maxPercentChange 100 &&