Skip to content

Commit 4655496

Browse files
committed
t1305: skip symlink tests that do not apply to Windows
In Git for Windows, the gitdir is canonicalized so that even when the gitdir is specified via a symbolic link, the `gitdir:` conditional include will only match the real directory path. Unfortunately, t1305 codifies a different behavior in two test cases, which are hereby skipped on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent d28cc4d commit 4655496

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t1305-config-include.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ test_expect_success SYMLINKS 'conditional include, relative path with symlinks'
286286
)
287287
'
288288

289-
test_expect_success SYMLINKS 'conditional include, gitdir matching symlink' '
289+
test_expect_success SYMLINKS,!MINGW 'conditional include, gitdir matching symlink' '
290290
ln -s foo bar &&
291291
(
292292
cd bar &&
@@ -298,7 +298,7 @@ test_expect_success SYMLINKS 'conditional include, gitdir matching symlink' '
298298
)
299299
'
300300

301-
test_expect_success SYMLINKS 'conditional include, gitdir matching symlink, icase' '
301+
test_expect_success SYMLINKS,!MINGW 'conditional include, gitdir matching symlink, icase' '
302302
(
303303
cd bar &&
304304
echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&

0 commit comments

Comments
 (0)