Merge branch 'mm/checkout-auto-track-fix' into maint

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 67869b4813dd354f4376ead1470ecb0e58929302..b3b11e61c03e5d6d3e49a6f2d4a2281f05a7a600 100755 (executable)
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' '
 
 test_expect_success C_LOCALE_OUTPUT 'output from clone' '
        rm -fr dst &&
-       git clone -n "file://$(pwd)/src" dst >output &&
+       git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
        test $(grep Clon output | wc -l) = 1
 '
 
@@ -280,4 +280,9 @@ test_expect_success 'clone checking out a tag' '
        test_cmp fetch.expected fetch.actual
 '
 
+test_expect_success NOT_MINGW,NOT_CYGWIN 'clone local path foo:bar' '
+       cp -R src "foo:bar" &&
+       git clone "./foo:bar" foobar
+'
+
 test_done