Simplify patches and make them more robust #6478
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.
Why are these changes needed?
Most of our patches have extraneous information and additional context that is unnecessary, confusing, or even outright wrong (such as file hashes that won't match, e.g. due to the order in which patches are applied).
Unnecessary context in particular can also result in extraneous conflicts when updating a library, and make it harder to understand what is going on.
Simplifying them to include only the relevant lines (instead of just the 3-line default) makes them easier to understand and maintain.
Note: when reviewing: I recommend split view when reviewing, rather than unified view, or the changes may be confusing. (You can switch by clicking the gear icon in the changes tab.)
Related issue number
#631
Checks
scripts/format.sh
to lint the changes in this PR.