fix: use --keep-cr option for git am #254
Merged
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.
If the file being patched has CRLF line endings,
git am
will fail to apply an otherwise good patch. That's what causes the backport to24-x-y
on electron/electron#37603 to fail.This change refs
script/lib/git.py
ine/e
where the--keep-cr
option is enabled by default with the usage ofgit am
for applying patches there, for this same reason:For reference, here are the logs for the failed backport on that PR: