Merge branch 'jc/abbrev-autoscale-config' into maint

diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index c33d089980b4a68f7191753e930a69355c307fc9..26ebb0375deb67be38974c7c5610f090a5a2a9aa 100755 (executable)
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -31,14 +31,14 @@ test_expect_success 'objects inaccessible without alternates' '
 '
 
 test_expect_success 'access alternate via absolute path' '
-       check_obj "$(pwd)/one.git/objects" <<-EOF
+       check_obj "$PWD/one.git/objects" <<-EOF
        $one blob
        $two missing
        EOF
 '
 
 test_expect_success 'access multiple alternates' '
-       check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
+       check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
        $one blob
        $two blob
        EOF
@@ -79,7 +79,7 @@ test_expect_success 'mix of quoted and unquoted alternates' '
        $two blob
 '
 
-test_expect_success 'broken quoting falls back to interpreting raw' '
+test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '
        mv one.git \"one.git &&
        check_obj \"one.git/objects <<-EOF
        $one blob