#48797: build: use --keep-non-patch flag with git am
Merged
Description of Change
There's an edge case with our patch system where if we cherry-pick an upstream patch that starts with bracketed text, that text is stripped when the patch is applied and then re-exporting the patches causes shear. We've run into that in #48791.
More info on the effect of git am --keep-non-patch (which is just a pass through for git mailinfo -b).
Checklist
- PR description included and stakeholders cc'd
Release Notes
Notes: none
Backports
37-x-y
MergedPR Number
#48809Merged At
Nov 6, 2025, 8:48:57 AM
Released In
v37.9.0Release Date
Nov 7, 2025, 3:51:45 PM
38-x-y
MergedPR Number
#48806Merged At
Nov 6, 2025, 5:00:11 AM
Released In
v38.6.0Release Date
Nov 6, 2025, 4:37:39 PM
39-x-y
MergedPR Number
#48808Merged At
Nov 6, 2025, 5:00:03 AM
Released In
v39.1.1Release Date
Nov 6, 2025, 12:01:53 PM
40-x-y
MergedPR Number
#48807Merged At
Nov 6, 2025, 5:00:07 AM
Released In
v40.0.0-alpha.4Release Date
Nov 6, 2025, 7:32:10 AM
Semver Impact
Major
Breaking changes
Minor
New features
Patch
Bug fixes
None
Docs, tests, etc.
Semantic Versioning helps users understand the impact of updates:
- Major (X.y.z): Breaking changes that may require code modifications
- Minor (x.Y.z): New features that maintain backward compatibility
- Patch (x.y.Z): Bug fixes that don't change the API
- None: Changes that don't affect using facing parts of Electron