Error on single_version_override patch with wrong patch_strip#28566
Open
fmeum wants to merge 3 commits intobazelbuild:masterfrom
Open
Error on single_version_override patch with wrong patch_strip#28566fmeum wants to merge 3 commits intobazelbuild:masterfrom
fmeum wants to merge 3 commits intobazelbuild:masterfrom
Conversation
github-actions
bot
added
team-ExternalDeps
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a helpful error message when a patch for a single_version_override is used with patch_strip = 0 but the patch file contains a/ and b/ prefixes typical of a git diff. This prevents silent failures where the patch is not applied. The change includes a new check in PatchUtil.java and a corresponding test case. My review suggests an improvement to the new error message to report a more accurate line number, making it more useful for debugging.
src/main/java/com/google/devtools/build/lib/bazel/repository/decompressor/PatchUtil.java
Outdated
Show resolved
Hide resolved
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Collaborator
Author
|
@bazel-io fork 9.1.0 |
Collaborator
Author
|
@bazel-io fork 9.0.1 |
Collaborator
Author
|
@bazel-io fork 8.6.0 |
This was referenced Feb 6, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Since diffs that don't apply to the MODULE.bazel file are silently skipped (see c413192), this is needed to make users aware that their patch doesn't actually apply to the file.
Fixes #28560