Git blame buffer gives the wrong result in many cases where there are… #6572
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
added 2 commits
May 31, 2023 14:20
… multiple local edits.
I added multiple failing tests cases to tests/libgit2/blame/buffer.c to cover the test cases.
blame.c has been updated to get these tests to pass.
Fixes include:
shift_hunks_by now no longer shifts hunks before the start line.
Adjusting the wedge line in the case where a new hunk deletes and adds lines.
In buffer_line_cb for addions humks are now shifted after the current diff line.
Fixing the logic for removing a line in buffer_line_cb to work with multi-line deletions.
|
In Gittyup we have a similar patch like your one. It would be nice if this one gets merged, so we don't need our patch anymore |
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.
… multiple local edits.
I added 7 new failing tests to tests/libgit2/blame/buffer.c.
blame.c has been updated to get these tests to pass.
Fixes include:
shift_hunks_by now no longer shifts hunks before the start line.
Adjusting the wedge line in the case where a new hunk deletes and adds multiple lines.
In buffer_line_cb, hunks are now shifted after the current diff line for additions.
Fixing the logic for removing a line in buffer_line_cb to work with multi-line deletions.