[PATCH] Tweak t3102-ls-tree-wildcards to run on Windows

Subsystems: the rest

DORMANTno replies

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

[PATCH] Tweak t3102-ls-tree-wildcards to run on Windows

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:51:13

From: Johannes Sixt <redacted>

The test case fails on Windows, because "a*" is an invalid file name.
Therefore, use "a[a]" instead.

Signed-off-by: Johannes Sixt <redacted>
---
 Regarding the change from * to [], I do not know whether the result
 still tests the same thing. Please advise!

 -- Hannes

 t/t3102-ls-tree-wildcards.sh |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index f2b2a52..c286854 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
 '
 
-- 
1.7.5.1.1646.g44dd

Re: [PATCH] Tweak t3102-ls-tree-wildcards to run on Windows

From: Nguyen Thai Ngoc Duy <hidden>
Date: 2016-06-15 22:51:13

2011/5/12 Johannes Sixt [off-list ref]:
From: Johannes Sixt <redacted>

The test case fails on Windows, because "a*" is an invalid file name.
Therefore, use "a[a]" instead.

Signed-off-by: Johannes Sixt <redacted>
---
 Regarding the change from * to [], I do not know whether the result
 still tests the same thing. Please advise!
The result is correct. Whatever pattern you throw at ls-tree should be
interpreted literally, no magic at all.

Acked-by: me.
-- 
Duy
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help