[scripts/vcpkg_apply_patches] Warn of patches that mismatch whitespace #43657
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
WangWeiLin-MV
added
info:internal
WangWeiLin-MV
changed the title
WangWeiLin-MV
force-pushed
the
scripts/apply-patch/option-ignore-whitespace
branch
5 times, most recently
from
8b4f45e to
911b7c1
Compare
WangWeiLin-MV
changed the title
WangWeiLin-MV
force-pushed
the
scripts/apply-patch/option-ignore-whitespace
branch
7 times, most recently
from
24c512b to
9bfecb2
Compare
WangWeiLin-MV
force-pushed
the
scripts/apply-patch/option-ignore-whitespace
branch
from
9bfecb2 to
30fb07b
Compare
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.
There was a full text git diff when the patch was updated https://github.com/microsoft/vcpkg/pull/43311/files#diff-18617bc1c604f064b8369ec5f499f0c6cc6fc28501d5bfce7946efdc5e28bebb.
It is due to the existing patch used CRLF instead of the LF in original file. Which results in subsequent patch modifications, requiring mixing of EOL or keeping mismatched EOL to avoid full text update.
As a mitigation, change the implicit--ignore-whitespace --whitespace=nowarnto explicit optionX_PATCHES_IGNORE_WHITESPACEto prevent patches introduced unexpected EOL. 911b7c1#diff-b9d68c8c82e07d27d215ef4ac2fc2f97ad664bc18051fe6d238941dacf848c20Throw warning only since there are more than 100 ports affected by this issue https://dev.azure.com/vcpkg/public/_build/results?buildId=112204&view=logs&j=f79cfdd7-47a8-597f-8f57-dc3e21a8f2ad&t=4f03addf-ef5a-50a2-71be-19894d9df4e3&l=47901