diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-23 11:22:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-23 11:22:24 +0900 |
| commit | 4a04f718c028d66f1212f74638b301a1a2653fdb (patch) | |
| tree | a4c19f8f33ff385ac861d0a2a510774b4fbc578f | |
| parent | 56a64fcdc32568cfe1db34c44767a740d25d6d21 (diff) | |
| parent | 23fb328c8de7d4ad07360629109cf1b5fa42daa6 (diff) | |
| download | git-4a04f718c028d66f1212f74638b301a1a2653fdb.tar.gz | |
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
| -rwxr-xr-x | t/t7610-mergetool.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 8cc64729ad..7b957022f1 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -33,7 +33,7 @@ test_expect_success 'setup' ' git add foo && git commit -m "Add foo" ) && - git submodule add git://example.com/submod submod && + git submodule add file:///dev/null submod && git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod && git commit -m "add initial versions" && @@ -614,7 +614,7 @@ test_expect_success 'submodule in subdirectory' ' ) ) && test_when_finished "rm -rf subdir/subdir_module" && - git submodule add git://example.com/subsubmodule subdir/subdir_module && + git submodule add file:///dev/null subdir/subdir_module && git add subdir/subdir_module && git commit -m "add submodule in subdirectory" && |