Synchronize with MSYS2's current version of the MSYS2 runtime #136
Conversation
This file contains 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
Most notably, this integrates the fixes from msys2/msys2-runtime#179. Signed-off-by: Johannes Schindelin <[email protected]>
One of the recent patches applies cleanly when cherry-picked, but not when applied as a patch, because I merged the `msys2-3.4.9` branch whose patches' context is changed by patches that are in Git for Windows only, and that are applied before the fixups. I cherry-picked the last patch manually, generated the diff, and adjusted the patch. This will have to do for now, if we run `./update-patches.sh` again before rebasing to a newer MSYS2 runtime version, we will have to re-apply this here commit. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
sync-with-msys2-3.4.9
branch
from
b5132cd
to
83530f9
Compare
Signed-off-by: Johannes Schindelin <[email protected]>
|
/deploy msys2-runtime The workflow run was started. |
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.
Most notably, this integrates the fixes from msys2/msys2-runtime#179, taking the patches from git-for-windows/msys2-runtime#60 (which should be merged first).
This addresses git-for-windows/git#4701