fix(patch)!: stop parsing at garbage after hunk satisfied#7
Merged
weihanglo merged 3 commits intogit-format-patchfrom Jan 19, 2026
Merged
fix(patch)!: stop parsing at garbage after hunk satisfied#7weihanglo merged 3 commits intogit-format-patchfrom
weihanglo merged 3 commits intogit-format-patchfrom
Conversation
Hunk is satisfied when line counts from header are satisfied. - `hunk_lines()` now tracks old/new line counts during parsing - Stops at non-hunk line when counts satisfied - Errors if non-hunk line before counts satisfied While this is kinda a breaking change in behavior, it matches GNU patch behavior.
weihanglo
added a commit
that referenced
this pull request
Jan 25, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser fails with "expected end of hunk". Pattern first appeared in rust-lang/cargo@b119b891d.
weihanglo
added a commit
that referenced
this pull request
Jan 25, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser now correctly recognizes the hunk as complete instead of erroring with "expected end of hunk". This fixes parsing of `git diff` output in UniDiff mode where patches are split by `---/+++` boundaries, causing subsequent git headers to be appended to the previous patch. Pattern first appeared in rust-lang/cargo@b119b891d.
This was referenced Jan 25, 2026
weihanglo
added a commit
that referenced
this pull request
Apr 9, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser fails with "expected end of hunk". Pattern first appeared in rust-lang/cargo@b119b891d.
weihanglo
added a commit
that referenced
this pull request
Apr 9, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser now correctly recognizes the hunk as complete instead of erroring with "expected end of hunk". This fixes parsing of `git diff` output in UniDiff mode where patches are split by `---/+++` boundaries, causing subsequent git headers to be appended to the previous patch. Pattern first appeared in rust-lang/cargo@b119b891d.
weihanglo
added a commit
that referenced
this pull request
Apr 9, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser fails with "expected end of hunk". Pattern first appeared in rust-lang/cargo@b119b891d.
weihanglo
added a commit
that referenced
this pull request
Apr 9, 2026
This was a regression introduced by commit 79c086b (#7), which added garbage handling for complete hunks but missed the `no_newline_context` branch. When a hunk ends with `\ No newline at end of file` on a context line and is followed by trailing content (e.g., `diff --git` headers from UniDiff splitting), the parser now correctly recognizes the hunk as complete instead of erroring with "expected end of hunk". This fixes parsing of `git diff` output in UniDiff mode where patches are split by `---/+++` boundaries, causing subsequent git headers to be appended to the previous patch. Pattern first appeared in rust-lang/cargo@b119b891d.
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.
Hunk is satisfied when line counts from header are satisfied.
hunk_lines()now tracks old/new line counts during parsingWhile this is kinda a breaking change in behavior,
it matches GNU patch behavior.