aboutsummaryrefslogtreecommitdiffstats
path: root/git-curl-compat.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2023-02-06 09:43:28 +0100
committerJohannes Schindelin <johannes.schindelin@gmx.de>2023-02-06 09:43:28 +0100
commit6487e9c4594028c47559a868fc89f3302562cd8b (patch)
treed0a4818888ea8eba5fe7894006474de5b9c7268d /git-curl-compat.h
parentb78628d4264163fc276a24ce3eeeee47382ea268 (diff)
parenteb88fe1ff5ceb34845f0919b8bdc60d8a1703cf6 (diff)
downloadgit-6487e9c4594028c47559a868fc89f3302562cd8b.tar.gz
Sync with 2.37.6
* maint-2.37: Git 2.37.6 Git 2.36.5 Git 2.35.7 Git 2.34.7 http: support CURLOPT_PROTOCOLS_STR http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT Git 2.33.7 Git 2.32.6 Git 2.31.7 Git 2.30.8 apply: fix writing behind newly created symbolic links dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS clone: delay picking a transport until after get_repo_path() t5619: demonstrate clone_local() with ambiguous transport
Diffstat (limited to 'git-curl-compat.h')
-rw-r--r--git-curl-compat.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h
index 56a83b6bbd..fd96b3cdff 100644
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -126,4 +126,12 @@
#define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
#endif
+/**
+ * CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,
+ * released in August 2022.
+ */
+#if LIBCURL_VERSION_NUM >= 0x075500
+#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1
+#endif
+
#endif