Fixes #2083, #2539: Fixes stashing staged changes#2540
Merged
d13 merged 1 commit intogitkraken:mainfrom Mar 9, 2023
Merged
Conversation
1b15464 to
577c3d2
Compare
d13
approved these changes
Mar 9, 2023
Member
d13
left a comment
There was a problem hiding this comment.
This looks great @ShafinKhadem! Thanks for contributing!! 🎆
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
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.
Description
Fixes #2083, #2539: Fixes stashing staged changes
When stashing staged changes, filtering by pathspec doesn't work because a file can be partially staged. However with
--stagedflag, only the staged changes of a file can be stashed. This PR checks if the scm-group sent to the StashSaveCommand is 'index' and uses--stagedflag instead ofpathspecin that case.Checklist
Fixes $XXX -orCloses #XXX -prefix to auto-close the issue that your PR addresses