Merge pull request #1930 from mark2185/feature/discard-staged-only

1 files changed, 23 insertions, 1 deletions

diff --git a/pkg/gui/controllers/workspace_reset_controller.go b/pkg/gui/controllers/workspace_reset_controller.go
index dc830b3ba..f34739af7 100644
--- a/pkg/gui/controllers/workspace_reset_controller.go
+++ b/pkg/gui/controllers/workspace_reset_controller.go
@@ -12,7 +12,7 @@ import (
 func (self *FilesController) createResetMenu() error {
 	red := style.FgRed
 
-	nukeStr := "reset --hard HEAD && git clean -fd"
+	nukeStr := "git reset --hard HEAD && git clean -fd"
 	if len(self.model.Submodules) > 0 {
 		nukeStr = fmt.Sprintf("%s (%s)", nukeStr, self.c.Tr.LcAndResetSubmodules)
 	}
@@ -66,6 +66,28 @@ func (self *FilesController) createResetMenu() error {
 		},
 		{
 			LabelColumns: []string{
+				self.c.Tr.LcDiscardStagedChanges,
+				red.Sprint("stash staged and drop stash"),
+			},
+			Tooltip: self.c.Tr.DiscardStagedChangesDescription,
+			OnPress: func() error {
+				self.c.LogAction(self.c.Tr.Actions.RemoveStagedFiles)
+				if !self.helpers.WorkingTree.IsWorkingTreeDirty() {
+					return self.c.ErrorMsg(self.c.Tr.NoTrackedStagedFilesStash)
+				}
+				if err := self.git.Stash.SaveStagedChanges("[lazygit] tmp stash"); err != nil {
+					return self.c.Error(err)
+				}
+				if err := self.git.Stash.DropNewest(); err != nil {
+					return self.c.Error(err)
+				}
+
+				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}})
+			},
+			Key: 'S',
+		},
+		{
+			LabelColumns: []string{
 				self.c.Tr.LcSoftReset,
 				red.Sprint("git reset --soft HEAD"),
 			},