Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-13 09:36:41 +0400
committerJunio C Hamano <gitster@pobox.com>2011-05-13 09:36:41 +0400
commit240fe0505f4dd96edf288906743368b4b2e3a864 (patch)
tree8e0bb96b1b947142eee3569de90c1b2538b1bf88 /t
parentdbe9c5adf95e99c35dd728af2114fccfb9117c65 (diff)
parent145f86a00925b126412387c5ce072ab13cd4df03 (diff)
Merge branch 'nd/struct-pathspec'
* nd/struct-pathspec: Tweak t3102-ls-tree-wildcards to run on Windows
Diffstat (limited to 't')
-rwxr-xr-xt/t3102-ls-tree-wildcards.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index f2b2a524d9..c286854485 100755
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -1,21 +1,21 @@
#!/bin/sh
-test_description='ls-tree with(out) wildcards'
+test_description='ls-tree with(out) globs'
. ./test-lib.sh
test_expect_success 'setup' '
- mkdir a aa "a*" &&
- touch a/one aa/two "a*/three" &&
- git add a/one aa/two "a*/three" &&
+ mkdir a aa "a[a]" &&
+ touch a/one aa/two "a[a]/three" &&
+ git add a/one aa/two "a[a]/three" &&
git commit -m test
'
-test_expect_success 'ls-tree a* matches literally' '
+test_expect_success 'ls-tree a[a] matches literally' '
cat >expected <<EOF &&
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 a*/three
+100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 a[a]/three
EOF
- git ls-tree -r HEAD "a*" >actual &&
+ git ls-tree -r HEAD "a[a]" >actual &&
test_cmp expected actual
'