Repository navigation
Preserve header-only Git file boundaries in UnifiedDiffReader - #240
Merged
wumpz merged 1 commit intoOct 10, 2026
Merged
Conversation
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
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.
UnifiedDiffReadermerges consecutive Git file sections when the preceding file has no text hunk. A patch generated by Git containing a binary edit, an empty-file addition, a mode-only change, a 100% rename, and a text edit currently returns one file instead of five; the final text file also inherits the preceding files' metadata.Start a fresh file when another
diffcommand is encountered within the same header section. Regression tests cover header-only files before a text hunk, consecutive header-only files at EOF, and a text hunk followed by mode-only and binary changes. They check file counts, metadata isolation, and application of the text patch.Validation on Temurin 17.0.20.1:
mvn -B packagepasses across both modules: 170 tests, no failures or errors, 3 existing skipped tests. Checkstyle reports no violations.AI assistance was used to implement the fix and regression tests; the verification above was run locally.