Fix cherry-picking a range selection of commits#5599
Merged
Conversation
After a successful paste, the "X commits copied" indicator hides and DidPaste is set, but the buffer is not cleared. If the user then range-selects multiple commits and presses shift+C, every Add() call rebuilds the set via SelectedHashSet(), which returns empty while DidPaste is true; each iteration of the copy loop therefore overwrites the previous one and only the last commit in the range survives.
After a successful paste DidPaste is true, hiding the "X commits copied" indicator but leaving the buffer populated. From the user's perspective this looks like a clean slate, so a new shift+C should start fresh. It is important to reset DidPaste first, before populating the buffer with the new commits, because otherwise each loop iteration would overwrite the previous one since Add() rebuilds the set via SelectedHashSet() which returns empty while DidPaste is set.
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.
After cherry-picking a commit, copying a range-selection of commits was broken in that it would copy only the last selected commit rather than all of them.