Skip to content

Commit fee3169

Browse files
committed
amend! t6423: introduce Windows-specific handling for symlinking to /dev/null
t6423: introduce Windows-specific handling for symlinking to /dev/null The device `/dev/null` does not exist on Windows, it's called `NUL` there. Calling `ln -s /dev/null my-symlink` in a symlink-enabled MSYS2 Bash will therefore literally link to a file or directory called `null` that is supposed to be in the current drive's top-level `dev` directory. Which typically does not exist. The test, however, really wants the created symbolic link to point to the NUL device. Let's instead use the `mklink` utility on Windows to perform that job, and keep using `ln -s /dev/null <target>` on non-Windows platforms. While at it, add the missing `SYMLINKS` prereq because this test _still_ would not pass on Windows before support for symbolic links is upstreamed from Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 4889158 commit fee3169

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t6423-merge-rename-directories.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5169,7 +5169,7 @@ test_setup_12m () {
51695169
)
51705170
}
51715171

5172-
test_expect_success '12m: Change parent of renamed-dir to symlink on other side' '
5172+
test_expect_success SYMLINKS '12m: Change parent of renamed-dir to symlink on other side' '
51735173
test_setup_12m &&
51745174
(
51755175
cd 12m &&

0 commit comments

Comments
 (0)