Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

curl: Fix regression reading netrc #133

Merged
merged 2 commits into from
Nov 14, 2024

Conversation

dscho
Copy link
Member

@dscho dscho commented Nov 14, 2024

See curl/curl#15496
and curl/curl#15513

Cherry-picked from 8b1c7bd (curl: Fix regression reading netrc, 2024-11-11) in msys2/MINGW-packages.

This is a companion to git-for-windows/MSYS2-packages#199, even if the problem did not affect the MINGW variant of curl in my case (I have no .netrc, yet the MSYS variant was affected).

See curl/curl#15496
and curl/curl#15513

Cherry-picked from 8b1c7bd (curl: Fix regression reading netrc,
2024-11-11) in msys2/MINGW-packages.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Nov 14, 2024

/deploy mingw-w64-curl

The i686/x86_64 and the arm64 workflow runs were started.

@dscho dscho force-pushed the fix-curl-8.11.0-regression branch from ca00a96 to d137911 Compare November 14, 2024 11:46
With the `.netrc` fix, two files are created by a patch. When reusing
the same `srcdir` for multiple architectures, this would cause problems.
So let's delete the files in question if the `.netrc` fix is done via a
separate `.patch` file.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the fix-curl-8.11.0-regression branch from d137911 to c16ba33 Compare November 14, 2024 12:33
@dscho dscho merged commit a38cabb into git-for-windows:main Nov 14, 2024
4 checks passed
@dscho dscho deleted the fix-curl-8.11.0-regression branch November 14, 2024 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants