git, branch v2.37.6Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v2.37.62023-02-06T08:38:32ZGit 2.37.62023-02-06T08:38:32ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:38:32Zurn:sha1:eb88fe1ff5ceb34845f0919b8bdc60d8a1703cf6
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sync with 2.36.52023-02-06T08:38:31ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:38:31Zurn:sha1:16004682f95ee0065892c3206bd6a69bfe4bc891
* maint-2.36:
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
Git 2.36.52023-02-06T08:37:53ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:37:53Zurn:sha1:673472a9635805d3b1fcd0038ecc0a9418078685
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sync with 2.35.72023-02-06T08:37:52ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:37:52Zurn:sha1:40843216c568d39ee4d10ee256dc76de4f54f0a0
* maint-2.35:
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
Git 2.35.72023-02-06T08:29:45ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:29:45Zurn:sha1:b7a92d078b9b9a39553623815699eb029074e39d
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sync with 2.34.72023-02-06T08:29:44ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:29:44Zurn:sha1:6a53a59bf9986f99c1a8dd0f36e2b9d6033e89f2
* maint-2.34:
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
Git 2.34.72023-02-06T08:29:17ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:29:17Zurn:sha1:91da4a29e168ab465beb713fca4d389193f8f16c
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sync with 2.33.72023-02-06T08:29:16ZJohannes Schindelinjohannes.schindelin@gmx.de2023-02-06T08:29:16Zurn:sha1:a7237f5ae981c7b3ac9898970813e4ec01987ee3
* maint-2.33:
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
Merge branch 'jk/curl-avoid-deprecated-api'2023-02-06T08:27:41ZJunio C Hamanogitster@pobox.com2023-01-20T23:36:21Zurn:sha1:bd6d3de01fdc6fcf040a22718673766e754631b5
Deal with a few deprecation warning from cURL library.
* jk/curl-avoid-deprecated-api:
http: support CURLOPT_PROTOCOLS_STR
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
http: support CURLOPT_PROTOCOLS_STR2023-02-06T08:27:09ZJeff Kingpeff@peff.net2023-01-17T03:04:48Zurn:sha1:f44e6a21057b0d8aae7c36f10537353330813f62
The CURLOPT_PROTOCOLS (and matching CURLOPT_REDIR_PROTOCOLS) flag was
deprecated in curl 7.85.0, and using it generate compiler warnings as of
curl 7.87.0. The path forward is to use CURLOPT_PROTOCOLS_STR, but we
can't just do so unilaterally, as it was only introduced less than a
year ago in 7.85.0.
Until that version becomes ubiquitous, we have to either disable the
deprecation warning or conditionally use the "STR" variant on newer
versions of libcurl. This patch switches to the new variant, which is
nice for two reasons:
- we don't have to worry that silencing curl's deprecation warnings
might cause us to miss other more useful ones
- we'd eventually want to move to the new variant anyway, so this gets
us set up (albeit with some extra ugly boilerplate for the
conditional)
There are a lot of ways to split up the two cases. One way would be to
abstract the storage type (strbuf versus a long), how to append
(strbuf_addstr vs bitwise OR), how to initialize, which CURLOPT to use,
and so on. But the resulting code looks pretty magical:
GIT_CURL_PROTOCOL_TYPE allowed = GIT_CURL_PROTOCOL_TYPE_INIT;
if (...http is allowed...)
GIT_CURL_PROTOCOL_APPEND(&allowed, "http", CURLOPT_HTTP);
and you end up with more "#define GIT_CURL_PROTOCOL_TYPE" macros than
actual code.
On the other end of the spectrum, we could just implement two separate
functions, one that handles a string list and one that handles bits. But
then we end up repeating our list of protocols (http, https, ftp, ftp).
This patch takes the middle ground. The run-time code is always there to
handle both types, and we just choose which one to feed to curl.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>