Skip to content

Commit 4a04f71

Browse files
committed
Merge branch 'ab/t7610-timeout'
Fix a source of flakiness in CI when compiling with SANITIZE=leak. * ab/t7610-timeout: t7610: use "file:///dev/null", not "/dev/null", fixes MinGW t7610: fix flaky timeout issue, don't clone from example.com
2 parents 56a64fc + 23fb328 commit 4a04f71

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 git://example.com/submod 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 git://example.com/subsubmodule 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)