Git - fix stage/unstage selected ranges in nested git repositories #191987
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
joaomoreno
requested changes
Sep 5, 2023
|
I think the fix makes more sense to happen in the git extension, this is the best approach. 👌 |
joaomoreno
approved these changes
Sep 6, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Related #188967
When opening a folder/workspace that contains nested git repositories some operations (ex: stage/unstage selected ranges) do not work as expected. I have tracked this down to the fact that the QuickDiffService will return both repositories instead of only the inner repository. Due to that, the diff information provided to the stage/unstage selected ranges commands is incorrect.
The issue could be fixed either in the git extension or in the QuickDiffService. The changes in this pull request fixes the issue in the git extension but I would like to get your thoughs on whether this should be fixed in the git extension or the QuickDiffService. Thanks!