submodules IsDirty item status #7869
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
ghost
assigned 
RussKie
reviewed
Mar 17, 2020
...elperTest.TestGetStatusChangedFilesFromString.ForScenario.status_ignored_files.approved.json
Show resolved
Hide resolved
gerhardol
force-pushed
the
feature/submodule-isdirty
branch
2 times, most recently
from
42451d5
to
5ecb56b
Compare
RussKie
approved these changes
Mar 23, 2020
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@msftbot merge in 24 hours |
|
Hello @gerhardol! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
gerhardol
force-pushed
the
feature/submodule-isdirty
branch
from
5ecb56b
to
4372f40
Compare
ghost
merged commit
This was referenced Mar 26, 2020
This pull request was closed.
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.
Fixes #7856
Proposed changes
Handle IsDirty attribute separate for submodules, previously it was sharing with IsTracked (if IsSubmodule is set, the item is always tracked). This special handling worked where the info was used, but this was incorrectly used in FormCommit.
A simplification (Replace ViewCurrentChanges with ViewChangesAsync) as a followup to #7825 will also address this, but this change should be done too.
This part is separated, to simplify reviews.
Also cleaned up the tests for parsing git-status some.
git-diff is not changed, the changed files is a consequence of using approval tests.
Screenshots
See #7856
Test methodology
Updated test cases
✒️ I contribute this code under The Developer Certificate of Origin.