Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 6195c557021e4765cc4c53b98d05369374563196..42962ed7d46f6dafa09c7b276942c32da130e300 100755 (executable)
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -41,9 +41,35 @@ test_expect_success 'no warning with bogus GIT_INDEX_VERSION and existing index'
                GIT_INDEX_VERSION=1 &&
                export GIT_INDEX_VERSION &&
                git add a 2>actual.err &&
-               >expect.err &&
+               test_must_be_empty actual.err
+       )
+'
+
+test_expect_success 'out of bounds index.version issues warning' '
+       (
+               sane_unset GIT_INDEX_VERSION &&
+               rm -f .git/index &&
+               git config --add index.version 1 &&
+               git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+               sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+                       warning: index.version set, but the value is invalid.
+                       Using version Z
+               EOF
                test_i18ncmp expect.err actual.err
        )
 '
 
+test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
+       (
+               rm -f .git/index &&
+               GIT_INDEX_VERSION=4 &&
+               export GIT_INDEX_VERSION &&
+               git config --add index.version 2 &&
+               git add a 2>&1 &&
+               echo 4 >expect &&
+               test-tool index-version <.git/index >actual &&
+               test_cmp expect actual
+       )
+'
+
 test_done