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 8354cf752ec (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 <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
Ævar Arnfjörð Bjarmason committed
Nov 16, 2022 at 00:40 UTC
23fb328c8de7d4ad07360629109cf1b5fa42daa6
1 file changed
+2
-2
t/t7610-mergetool.sh
+2
-2
@@ -33,7 +33,7 @@ test_expect_success 'setup' '
33
git add foo &&
34
git commit -m "Add foo"
35
) &&
36
- git submodule add /dev/null submod &&
36
+ git submodule add file:///dev/null submod &&
37
git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
38
git commit -m "add initial versions" &&
39
@@ -614,7 +614,7 @@ test_expect_success 'submodule in subdirectory' '
614
)
615
) &&
616
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 &&
618
git add subdir/subdir_module &&
619
git commit -m "add submodule in subdirectory" &&
620