fix: Make Git parser handle meta lines in chunk #567
Merged
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
|
Looks like there's a merge conflict. I'll rebase |
alilleybrinker
force-pushed
the
560-bug-fix
branch
from
155934d
to
3ef341a
Compare
|
Just realized this includes some nonsense changes to the Cargo.toml that appear to be holdovers from the rebase. I'll remove them |
mchernicoff
previously approved these changes
Nov 4, 2024
The previous parser for Git chunks would fail to properly break up chunks with any "meta lines" (my term for them) starting with a `\` instead of `+` or `-`. This update to the parser means the parser will now correctly handle those lines, but won't include them in the patch string it constructs, as they're meta-commentary on the diff itself and not part of the edits. Signed-off-by: Andrew Lilley Brinker <[email protected]> Co-authored-by: Julian Lanson <[email protected]>
alilleybrinker
force-pushed
the
560-bug-fix
branch
from
3ef341a
to
de67bed
Compare
|
@mchernicoff can I get a re-review? Just updated to no longer include the mistaken |
mchernicoff
approved these changes
Nov 4, 2024
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.
Fixes #560