summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2011-05-12 10:37:22 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-12 22:35:47 -0700
commit145f86a00925b126412387c5ce072ab13cd4df03 (patch)
tree45a53e3ce0a740cf94fbf2724bac326c962f7ab6
parentpathspec: rename per-item field has_wildcard to use_wildcard (diff)
downloadtgif-145f86a00925b126412387c5ce072ab13cd4df03.tar.xz
Tweak t3102-ls-tree-wildcards to run on Windows
The test case fails on Windows, because "a*" is an invalid file name. Therefore, use "a[a]" instead. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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
'