diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:39 -0800 |
| commit | 8834ea375a404a6c79a6d8cd8cbc9954c6f2847d (patch) | |
| tree | b9a108984c7f802519edf68ff4ed6fd3ad97131a /t/t2019-checkout-ambiguous-ref.sh | |
| parent | Merge branch 'jk/epipe-in-async' into maint (diff) | |
| parent | get_sha1: don't die() on bogus search strings (diff) | |
| download | tgif-8834ea375a404a6c79a6d8cd8cbc9954c6f2847d.tar.xz | |
Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint
"git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
rev, i.e. the object named by the the pathname with wildcard
characters in a tree object.
* nd/dwim-wildcards-as-pathspecs:
get_sha1: don't die() on bogus search strings
check_filename: tighten dwim-wildcard ambiguity
checkout: reorder check_filename conditional
Diffstat (limited to 't/t2019-checkout-ambiguous-ref.sh')
| -rwxr-xr-x | t/t2019-checkout-ambiguous-ref.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 199b22d85e..b99d5192a9 100755 --- a/t/t2019-checkout-ambiguous-ref.sh +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -56,30 +56,4 @@ 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 !MINGW '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 |