Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint

gitster · gitster · commit 0b2cef2805a0 · 2015-09-03T19:17:51.000-07:00
Test updates for Windows.

* nd/dwim-wildcards-as-pathspecs:
  t2019: skip test requiring '*' in a file name non Windows
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ test_expect_success 'wildcard ambiguation, paths win' '`
`69`	`69`	`)`
`70`	`70`	`'`
`71`	`71`
`72`		`-test_expect_success 'wildcard ambiguation, refs lose' '`
	`72`	`+test_expect_success !MINGW 'wildcard ambiguation, refs lose' '`
`73`	`73`	`git init ambi2 &&`
`74`	`74`	`(`
`75`	`75`	`cd ambi2 &&`