Add Discard command for Staged file(s) as well

[goran-w]

Sometimes I have staged changes, perhaps as a result of some command, which I then decide should be completely undone (i.e discarded). I then find it cumbersome that I have to first Unstage them and only then I'm able to actually Discard them.

This can be rather frustrating, since I then have to re-find the changed file(s) among potentially a long list of other Unstaged changes. Worst case, I may have carefully mult-selected a scattered bunch of Staged files, only to have to re-multi-select this scattered bunch again (now among the Unstaged files).

I therefore would suggest implementing a Discard command for Staged file(s) as well. It would be very convenient, more consistent, and the same confirmation dialog would apply.

[love-linger]

Since SourceGit does not provide a function like GitHub Desktop that moves changed files to the recycle bin first and then discards local changes, once a user discards some uncommitted changes, they cannot be recovered. Therefore, my suggestion is not to perform the Unstage + Discard operation on each file separately. Instead, when we need to discard a part of the changes from the staged changes:

1. Unstage all unnecessary change blocks at once
2. After confirming that the changes in STAGED are correct, commit them
3. After the commit is completed, decide whether to discard the previously unstaged changes all at once (using the Discard All operation) or keep them for the next commit

[goran-w]

As I described, that workflow could sometimes become rather tedious, since multi-selection is lost when doing Unstage. I think it SHOULD be OK to have this command there, since:

• It's not really any big difference from what can already be done for Unstaged changes!
• There would be the same warning/confirmation popup, before performing the destructive action.
• It would be more consistent to be able to use the Discard command on Unstaged and Staged changes alike.

(This inconsistency of NOT finding the Discard command in the Staged context-menu, when I was intently looking for it, has "stumped" me multiple times already - especially since some Git commands will automatically stage changes, which may have been temporary or supposed to be discarded later...)

[love-linger]

I don't think this is a consistency issue, because the status of these changes has already changed. You can intuitively see that the context menus for unstaged changes and staged changes are completely different.

that workflow could sometimes become rather tedious, since multi-selection is lost when doing Unstage

I don't understand. If you regard the Unstage context-menu entry as a Discard operation, then the only difference from the real discarding function is that the changes are not removed from the worktree, but they no longer affect your commits. Isn't it better to decide whether you need these changes after you finish committing?

I think this is also the reason why other software like VSCode and Fork do not provide a direct discard function for staged changes.

VSCode

Fork

[goran-w]

The main issue is this:

• If I've already multi-selected a whole bunch of scattered items (under Staged), because I've decided that they should all be discarded, then after doing Unstage I would have to REPEAT my previous (carefully done) multi-selection a second time (this time under Unstaged, possibly scattered differently among other unstaged items) in order to actually perform the intended Discard operation.

I don't really see why I shouldn't be allowed to perform this as a single action instead (with the usual warning- and confirmation-popup applied).