-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Discard of deleted files #689
Conversation
I did not fix stash, since stashing deleted files is frustrating. The best solution would be 'git stash push --staged' which would stash all staged files (just the deleted file), but this seems to break the unstaged files a little, where we now cannot see a diff from the Git UI, and git loses track of the type of operation (i.e. if a file is new, changed, etc.). Until I find a solution that doesn't break everything, recommendation would be to discard deletions (especially since deleting is an easy operation to redo if needed). |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #689 +/- ##
==========================================
- Coverage 40.60% 40.47% -0.13%
==========================================
Files 23 23
Lines 3145 3150 +5
==========================================
- Hits 1277 1275 -2
- Misses 1868 1875 +7 ☔ View full report in Codecov by Sentry. |
@isc-etamarch I think this fixes a somewhat different issue than what we saw today that motivated #688. I'm still able to replicate that one by:
This goes through a different code path that doesn't involve SourceControl.Git.DiscardState |
@isc-pbarton I see. That last commit should fix that as well (The other changes I made are still necessary for it to work) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One really minor nitpick - feel free to tack on a commit to fix, then merge.
Fixes #688