fix: last line change may disable hunk operation in two-side diff #2027
+28
−39
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
If the last line is deleted or added, it was impossible to stage, unstage or discard the last hunk in a two-side diff view, if the hunk was selected on the side where the last line is missing (that's the left side for added lines and the right side for deleted lines). Since the button(s) for hunk operations are on the right side of the diff view, it was easier to trigger this bug for a deleted last line. This bug was introduced in commit 6511d15 while rewriting the text diff views. This fixes the bug mentioned in sourcegit-scm#1950 (comment).
Collaborator
And this issue does not exists when trying to stage/discard/unstage with selected contents (not auto-detected hunk) in one side. I'll push my commit to fix this issue |
love-linger
added a commit
that referenced
this pull request
Jan 5, 2026
…ff (#2027) Signed-off-by: leo <longshuang@msn.cn>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
If the last line is deleted or added, it was impossible to stage, unstage or discard the last hunk in a two-side diff view, if the hunk was selected on the side where the last line is missing (that's the left side for added lines and the right side for deleted lines).
Since the button(s) for hunk operations are on the right side of the diff view, it was easier to trigger this bug for a deleted last line.
This bug was introduced in commit 6511d15 while rewriting the text diff views.
This fixes the bug mentioned in #1950 (comment).