Merge branch 'js/mingw-http-ssl'

diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index ae74d2664a4cb490028ba88ca97f07957629ba9a..2ac47aa0e4a7164cd06037496832a1744990a774 100755 (executable)
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -6,10 +6,12 @@ test_description='split index mode tests'
 
 # We need total control of index splitting here
 sane_unset GIT_TEST_SPLIT_INDEX
-# A couple of tests expect the index to have a specific checksum,
-# but the presence of the optional FSMN extension would interfere
-# with those checks, so disable it in this test script.
-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
 
 # Create a file named as $1 with content read from stdin.
 # Set the file's mtime to a few seconds in the past to avoid racy situations.
@@ -25,11 +27,11 @@ test_expect_success 'enable split index' '
        indexversion=$(test-tool index-version <.git/index) &&
        if test "$indexversion" = "4"
        then
-               own=432ef4b63f32193984f339431fd50ca796493569
-               base=508851a7f0dfa8691e9f69c7f055865389012491
+               own=3527df833c6c100d3d1d921a9a782d62a8be4b58
+               base=746f7ab2ed44fb839efdfbffcf399d0b113fb4cb
        else
-               own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
-               base=39d890139ee5356c7ef572216cebcd27aa41f9df
+               own=5e9b60117ece18da410ddecc8b8d43766a0e4204
+               base=4370042739b31cd17a5c5cd6043a77c9a00df113
        fi &&
        cat >expect <<-EOF &&
        own $own
@@ -67,7 +69,7 @@ test_expect_success 'disable split index' '
        EOF
        test_cmp ls-files.expect ls-files.actual &&
 
-       BASE=$(test-tool dump-split-index .git/index | grep "^own" | sed "s/own/base/") &&
+       BASE=$(test-tool dump-split-index .git/index | sed -n "s/^own/base/p") &&
        test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
        cat >expect <<-EOF &&
        not a split index