Skip to content

Commit 8facec0

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a390d7e commit 8facec0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

t/t1508-at-combinations.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ test_expect_success 'setup' '
3535
git checkout -b upstream-branch &&
3636
test_commit upstream-one &&
3737
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 &&
3942
git checkout -b @@/at-test &&
4043
git checkout -b @at-test &&
4144
git checkout -b old-branch &&
@@ -64,6 +67,7 @@ check "@{-1}@{u}@{1}" commit master-one
6467
check "@" commit new-two
6568
check "@@{u}" ref refs/heads/upstream-branch
6669
check "@@/at-test" ref refs/heads/@@/at-test
70+
test_have_prereq MINGW ||
6771
check "@/at-test" ref refs/heads/@/at-test
6872
check "@at-test" ref refs/heads/@at-test
6973
nonsense "@{u}@{-1}"

0 commit comments

Comments
 (0)