Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:51 +0000 (19:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:51 +0000 (19:17 -0700)
Test updates for Windows.

* nd/dwim-wildcards-as-pathspecs:
t2019: skip test requiring '*' in a file name non Windows

t/t2019-checkout-ambiguous-ref.sh
index 8396320d52c190012ecf86348b3a4a58a07c8163..199b22d85e92535f148eaaca4d3856dbdfb6bcec 100755 (executable)
@@ -69,7 +69,7 @@ test_expect_success 'wildcard ambiguation, paths win' '
        )
 '
 
-test_expect_success 'wildcard ambiguation, refs lose' '
+test_expect_success !MINGW 'wildcard ambiguation, refs lose' '
        git init ambi2 &&
        (
                cd ambi2 &&