Avoid resetting changes state when not showing stash #9921
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
|
Ran through some stashing scenarios as well as the issue from #7710 and all appears to be functioning as normal. 👍 |
outofambit
moved this from Awaiting Review
to Review In Progress
in Desktop 2.5.x releases
Co-authored-by: evelyn masso <outofambit@github.com>
outofambit
approved these changes
Jun 5, 2020
Desktop 2.5.x releases
automation
moved this from Review In Progress
to PRs For Next Beta
Jun 5, 2020
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.
References #7710
Description
This is a follow up to #9412 which fixed the problem described in #7710. This PR addresses a conceptual issue with regards to
_hideStashedChanges.After #9412
_hideStashedChangesPrior to this PR_hideStashedChangeswould always reset the changes state to show the working directory changes (selecting all of the changes in the working directory since it didn't have the context that the<Changes>component has about previous selection). This small change makes the method a noop when there's no stash visible.See #9412 (review)