summaryrefslogtreecommitdiff
path: root/git-curl-compat.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-10-14 13:41:25 -0700
committerJunio C Hamano <gitster@pobox.com>2025-10-14 13:41:25 -0700
commit2ba32befc9c71a5ba9314d9661d16639883ce4d4 (patch)
treefae4a1ab1850e98a9263c4bc8d37067f8f329b97 /git-curl-compat.h
parent3bc761681f4363942ba80f0a4eaf6164d919c362 (diff)
parent1b5a6bfff323297bef85bb36fe65e8c18cf6bc73 (diff)
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 'git-curl-compat.h')
-rw-r--r--git-curl-compat.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h
index aa8eed7ed2..659e5a3875 100644
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -46,6 +46,13 @@
#endif
/**
+ * curl_global_trace() was added in 8.3.0, released September 2023.
+ */
+#if LIBCURL_VERSION_NUM >= 0x080300
+#define GIT_CURL_HAVE_GLOBAL_TRACE 1
+#endif
+
+/**
* CURLOPT_TCP_KEEPCNT was added in 8.9.0, released in July, 2024.
*/
#if LIBCURL_VERSION_NUM >= 0x080900