Accommodate for the libcurl split #502
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As of git-for-windows/MINGW-packages#76, Git for Windows wants to ship with _two_ libcurl variants: one that includes the Secure Channel backend to talk https://, and another one that includes the OpenSSL backend instead. Therefore, the `make-file-list` script that is used by Git for Windows' automation to list the files required for the various release assets needs to be adjusted, too. Signed-off-by: Johannes Schindelin <[email protected]>
Since git-for-windows/MINGW-packages#76, Git for Windows' SDKs no longer install the `mingw-w64-curl` package but instead the `mingw-w64-curl-winssl` package. As a consequence, we now have to include the PDBs for that package, too. Signed-off-by: Johannes Schindelin <[email protected]>
In line with git-for-windows/MINGW-packages#76, the default SSL/TLS backend is now the Secure Channel one. Let's reflect that in the installer. This makes Git for Windows' maintenance easier (see git-for-windows/git#4350 for a fuller explanation). But it has further benefits: the Secure Channel backend is the "more native" choice on Windows, as it integrates better with Windows. For example, when trusting a host with a self-signed certificate in a web browser, that trust extends to Secure Channel. With the OpenSSL backend, users had to jump through manual hoops to get `git clone <url>` to trust a host with a self-signed certificate. Note: The installer will _still_ pick up previous choices when upgrading from an earlier Git for Windows version. Only fresh installs without any current Git for Windows installations will receive the new default. Signed-off-by: Johannes Schindelin <[email protected]>
This is not an unused DLL ;-) Signed-off-by: Johannes Schindelin <[email protected]>
At the moment, the command `git -c http.sslBackend=openssl <...>` will fail because there is not yet any new mingw-w64-git package version that supports dynamically loading various libcurl variants depending on the configured backend choice. This is not a terrible thing because Git for Windows v2.41.0-rc0 is imminent (due either later today, or at the latest tomorrow), and that will address the issue. So let's adjust the checks accordingly, to be lenient in case they are run with Git for Windows v2.40.1 (i.e. the still-current newest package version). Signed-off-by: Johannes Schindelin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ongoing work to address git-for-windows/git#4350 requires a couple of minor downstream adjustments in
build-extra. This PR implements those adjustments.