diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:41:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:41:25 -0700 |
| commit | 2ba32befc9c71a5ba9314d9661d16639883ce4d4 (patch) | |
| tree | fae4a1ab1850e98a9263c4bc8d37067f8f329b97 /t | |
| parent | Merge branch 'kh/doc-fast-import-markup-fix' into maint-2.51 (diff) | |
| parent | curl: add support for curl_global_trace() components (diff) | |
| download | git-2ba32befc9c71a5ba9314d9661d16639883ce4d4.tar.gz git-2ba32befc9c71a5ba9314d9661d16639883ce4d4.zip | |
Merge branch 'jk/curl-global-trace-components' into maint-2.51
Adjust to the way newer versions of cURL selectivel enables tracing
options, so that our tests can continue to work.
* jk/curl-global-trace-components:
curl: add support for curl_global_trace() components
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5564-http-proxy.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t5564-http-proxy.sh b/t/t5564-http-proxy.sh index b27e481f95..c3903faf2d 100755 --- a/t/t5564-http-proxy.sh +++ b/t/t5564-http-proxy.sh @@ -72,7 +72,9 @@ test_expect_success SOCKS_PROXY 'clone via Unix socket' ' test_when_finished "rm -rf clone" && test_config_global http.proxy "socks4://localhost$PWD/%2530.sock" && { { - GIT_TRACE_CURL=$PWD/trace git clone "$HTTPD_URL/smart/repo.git" clone 2>err && + GIT_TRACE_CURL=$PWD/trace \ + GIT_TRACE_CURL_COMPONENTS=socks \ + git clone "$HTTPD_URL/smart/repo.git" clone 2>err && grep -i "SOCKS4 request granted" trace } || old_libcurl_error err |