mingw: skip test in t1508 that fails due to path conversion
In Git for Windows, the MSYS2 POSIX emulation layer used by the Bash converts command-line arguments that looks like they refer to a POSIX path containing a file list (i.e. @<absolute-path>) into a Windows path equivalent when calling non-MSYS2 executables, such as git.exe. Let's just skip the test that uses the parameter `@/at-test` that confuses the MSYS2 runtime. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 27, 2016 at 17:19 UTC
8facec08fe45359e2147175cd8276df9c08b3fbc
1 file changed
+5
-1
t/t1508-at-combinations.sh
+5
-1
@@ -35,7 +35,10 @@ test_expect_success 'setup' '
35
git checkout -b upstream-branch &&
36
test_commit upstream-one &&
37
test_commit upstream-two &&
38
- git checkout -b @/at-test &&
38
+ if test_have_prereq !MINGW
39
+ then
40
+ git checkout -b @/at-test
41
+ fi &&
42
git checkout -b @@/at-test &&
43
git checkout -b @at-test &&
44
git checkout -b old-branch &&
@@ -64,6 +67,7 @@ check "@{-1}@{u}@{1}" commit master-one
67
check "@" commit new-two
68
check "@@{u}" ref refs/heads/upstream-branch
69
check "@@/at-test" ref refs/heads/@@/at-test
70
+test_have_prereq MINGW ||
71
check "@/at-test" ref refs/heads/@/at-test
72
check "@at-test" ref refs/heads/@at-test
73
nonsense "@{u}@{-1}"