[PATCH nd/dwim-wildcards-as-pathspecs] t2019: skip test requiring '*' in a file name non Windows

12 views
Skip to first unread message

Johannes Sixt

unread,
Aug 11, 2015, 4:38:48 PM8/11/15
to Git Mailing List, msysGit
A test case introduced by ae454f61 (Add tests for wildcard "path vs ref"
disambiguation) allocates a file named '*.c'. This does not work on
Windows, because the OS forbids file names containing wildcard
characters. The test case fails where the shell attempts to allocate the
file. Skip the test on Windows.

Signed-off-by: Johannes Sixt <j...@kdbg.org>
---
This fixes a new failure in the test suite (t3404.8[67]) on Windows, but
I got around to debug it only now.

t/t2019-checkout-ambiguous-ref.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index 8396320..199b22d 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -69,7 +69,7 @@ test_expect_success 'wildcard ambiguation, paths win' '
)
'

-test_expect_success 'wildcard ambiguation, refs lose' '
+test_expect_success !MINGW 'wildcard ambiguation, refs lose' '
git init ambi2 &&
(
cd ambi2 &&
--
2.3.2.245.gb5bf9d3

Johannes Schindelin

unread,
Aug 12, 2015, 7:25:58 AM8/12/15
to Johannes Sixt, Git Mailing List, msysGit
Hi,

On 2015-08-11 22:38, Johannes Sixt wrote:

> diff --git a/t/t2019-checkout-ambiguous-ref.sh
> b/t/t2019-checkout-ambiguous-ref.sh
> index 8396320..199b22d 100755
> --- a/t/t2019-checkout-ambiguous-ref.sh
> +++ b/t/t2019-checkout-ambiguous-ref.sh
> @@ -69,7 +69,7 @@ test_expect_success 'wildcard ambiguation, paths win' '
> )
> '
>
> -test_expect_success 'wildcard ambiguation, refs lose' '
> +test_expect_success !MINGW 'wildcard ambiguation, refs lose' '
> git init ambi2 &&
> (
> cd ambi2 &&

FWIW I planned to submit a patch including this fix:

https://github.com/git-for-windows/git/commit/4694320330e1b4d9178e13e215ce60a1cc8e0b1c

(The idea of the `fixup! ` was to make this change part of a larger change during the next merging rebase of Git for Windows.)

Ciao,
Johannes

Junio C Hamano

unread,
Aug 12, 2015, 12:28:18 PM8/12/15
to Johannes Schindelin, Johannes Sixt, Git Mailing List, msysGit
Thanks. Is that an Ack?

Johannes Schindelin

unread,
Aug 13, 2015, 4:30:17 AM8/13/15
to Junio C Hamano, Johannes Sixt, Git Mailing List, msysGit
Hi Junio,

On 2015-08-12 18:28, Junio C Hamano wrote:
Yes, this is an Ack. (Although I would have preferred to organize the contribution of Windows-related patches better, really.)

Ciao,
Dscho
Reply all
Reply to author
Forward
0 new messages