Skip to content

Commit 23fb328

Browse files
avarttaylorr
authored andcommitted
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
On MinGW the "/dev/null" is translated to "nul" on command-lines, even though as in this case it'll never end up referring to an actual file. So on Windows the fix for the previous "example.com" timeout issue in 8354cf7 (t7610: fix flaky timeout issue, don't clone from example.com, 2022-11-05) would yield: fatal: repo URL: 'nul' must be absolute or begin with ./|../ Let's evade this yet again by prefixing this with "file://", which makes this pass in the Windows CI. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent 8354cf7 commit 23fb328

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t7610-mergetool.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_expect_success 'setup' '
3333
git add foo &&
3434
git commit -m "Add foo"
3535
) &&
36-
git submodule add /dev/null submod &&
36+
git submodule add file:///dev/null submod &&
3737
git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
3838
git commit -m "add initial versions" &&
3939
@@ -614,7 +614,7 @@ test_expect_success 'submodule in subdirectory' '
614614
)
615615
) &&
616616
test_when_finished "rm -rf subdir/subdir_module" &&
617-
git submodule add /dev/null subdir/subdir_module &&
617+
git submodule add file:///dev/null subdir/subdir_module &&
618618
git add subdir/subdir_module &&
619619
git commit -m "add submodule in subdirectory" &&
620620

0 commit comments

Comments
 (0)