diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-18 10:07:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-18 10:07:02 -0700 |
| commit | bf781d93b6b768c6e2bef12af73fcb3e14dd1a33 (patch) | |
| tree | 834ed7ec6753ddb65f85753ab07750deeea52617 /t/t5564-http-proxy.sh | |
| parent | 9827e07aa043448941c08ddffb3563e3957446f1 (diff) | |
| parent | 1b5a6bfff323297bef85bb36fe65e8c18cf6bc73 (diff) | |
| download | git-bf781d93b6b768c6e2bef12af73fcb3e14dd1a33.tar.gz | |
Merge branch 'jk/curl-global-trace-components'
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/t5564-http-proxy.sh')
| -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 |