Prevent patch context being ignored (#4193) #4195
Open
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
The initial 'git apply' command does not employ the -C option to allow fuzzy context matching, so neither should the fallback 'patch' command be allowed to use its default fuzz factor. Both commands should treat context in a consistent manner. By default 'patch' will allow a hunk to apply with only a single line of the provided context matching either side, and by default drush make will not show any of the output which indicates that such fuzzy matching has taken place. This makes it far too easy for inapplicable patches to be 'successfully' (but incorrectly) applied, with no warning to the user.
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.
The initial 'git apply' command does not employ the -C option to allow
fuzzy context matching, so neither should the fallback 'patch' command
be allowed to use its default fuzz factor. Both commands should treat
context in a consistent manner.
By default 'patch' will allow a hunk to apply with only a single line
of the provided context matching either side, and by default drush make
will not show any of the output which indicates that such fuzzy matching
has taken place.
This makes it far too easy for inapplicable patches to be 'successfully'
(but incorrectly) applied, with no warning to the user.