Merge branch 'nd/dwim-wildcards-as-pathspecs'

Test updates to a topic already in 2.5-rc.

* nd/dwim-wildcards-as-pathspecs:
Add tests for wildcard "path vs ref" disambiguation

diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index b99d5192a96ec77ef6a99cb86518375c447b48a9..8396320d52c190012ecf86348b3a4a58a07c8163 100755 (executable)
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -56,4 +56,30 @@ test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' '
        test_i18ngrep ! "^HEAD is now at" stderr
 '
 
+test_expect_success 'wildcard ambiguation, paths win' '
+       git init ambi &&
+       (
+               cd ambi &&
+               echo a >a.c &&
+               git add a.c &&
+               echo b >a.c &&
+               git checkout "*.c" &&
+               echo a >expect &&
+               test_cmp expect a.c
+       )
+'
+
+test_expect_success 'wildcard ambiguation, refs lose' '
+       git init ambi2 &&
+       (
+               cd ambi2 &&
+               echo a >"*.c" &&
+               git add . &&
+               test_must_fail git show :"*.c" &&
+               git show :"*.c" -- >actual &&
+               echo a >expect &&
+               test_cmp expect actual
+       )
+'
+
 test_done