Merge branch 'ss/msvc'

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 8867ce10f8c40cd72c9395c2b36b8b40b5e91fcf..d934a2441724332d9e8cebd7679788ee3a660fce 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -699,17 +699,13 @@ test_expect_success 'invalid unit' '
        echo 1auto >expect &&
        git config aninvalid.unit >actual &&
        test_cmp expect actual &&
-       cat >expect <<-\EOF &&
-       fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in file .git/config: invalid unit
-       EOF
        test_must_fail git config --int --get aninvalid.unit 2>actual &&
-       test_i18ncmp expect actual
+       test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
 '
 
 test_expect_success 'invalid stdin config' '
-       echo "fatal: bad config line 1 in standard input " >expect &&
        echo "[broken" | test_must_fail git config --list --file - >output 2>&1 &&
-       test_cmp expect output
+       test_i18ngrep "bad config line 1 in standard input" output
 '
 
 cat > expect << EOF
@@ -1091,6 +1087,20 @@ test_expect_success 'git -c complains about empty key and value' '
        test_must_fail git -c "" rev-parse
 '
 
+test_expect_success 'multiple git -c appends config' '
+       test_config alias.x "!git -c x.two=2 config --get-regexp ^x\.*" &&
+       cat >expect <<-\EOF &&
+       x.one 1
+       x.two 2
+       EOF
+       git -c x.one=1 x >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'git -c is not confused by empty environment' '
+       GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
+'
+
 test_expect_success 'git config --edit works' '
        git config -f tmp test.value no &&
        echo test.value=yes >expect &&
@@ -1148,6 +1158,9 @@ test_expect_success 'urlmatch' '
                cookieFile = /tmp/cookie.txt
        EOF
 
+       test_expect_code 1 git config --bool --get-urlmatch doesnt.exist https://good.example.com >actual &&
+       test_must_be_empty actual &&
+
        echo true >expect &&
        git config --bool --get-urlmatch http.SSLverify https://good.example.com >actual &&
        test_cmp expect actual &&
@@ -1209,6 +1222,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
          "die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
 '
 
+! test_have_prereq MINGW ||
+HOME="$(pwd)" # convert to Windows path
+
 test_expect_success 'set up --show-origin tests' '
        INCLUDE_DIR="$HOME/include" &&
        mkdir -p "$INCLUDE_DIR" &&
@@ -1308,7 +1324,7 @@ test_expect_success 'set up custom config file' '
        EOF
 '
 
-test_expect_success '--show-origin escape special file name characters' '
+test_expect_success !MINGW '--show-origin escape special file name characters' '
        cat >expect <<-\EOF &&
                file:"file\" (dq) and spaces.conf"      user.custom=true
        EOF
@@ -1337,7 +1353,7 @@ test_expect_success '--show-origin stdin with file include' '
        test_cmp expect output
 '
 
-test_expect_success '--show-origin blob' '
+test_expect_success !MINGW '--show-origin blob' '
        cat >expect <<-\EOF &&
                blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08   user.custom=true
        EOF
@@ -1346,7 +1362,7 @@ test_expect_success '--show-origin blob' '
        test_cmp expect output
 '
 
-test_expect_success '--show-origin blob ref' '
+test_expect_success !MINGW '--show-origin blob ref' '
        cat >expect <<-\EOF &&
                blob:"master:file\" (dq) and spaces.conf"       user.custom=true
        EOF