Merge 7547073172 into 223978eb82

pkg/commands/git_commands/commit.go

@@ -76,6 +76,7 @@ func AddCoAuthorToDescription(description string, author string) string {
 // ResetToCommit reset to commit
 func (self *CommitCommands) ResetToCommit(hash string, strength string, envVars []string) error {
 	cmdArgs := NewGitCmd("reset").Arg("--"+strength, hash).ToArgv()
+	self.Log.Warn("Here")
 
 	return self.cmd.New(cmdArgs).
 		// prevents git from prompting us for input which would freeze the program

pkg/gui/controllers/workspace_reset_controller.go

@@ -144,6 +144,27 @@ func (self *FilesController) createResetMenu() error {
 				red.Sprint("git reset --hard HEAD"),
 			},
 			OnPress: func() error {
+				dirtyWorkingTree := self.c.Helpers().WorkingTree.IsWorkingTreeDirty()
+				self.c.Log.Warn(dirtyWorkingTree)
+				if dirtyWorkingTree {
+					return self.c.Confirm(types.ConfirmOpts{
+						Title:         self.c.Tr.HardResetTitle,
+						Prompt:        self.c.Tr.HardResetPrompt,
+						HandleConfirm: hardReset(self),
+					})
+				} else {
+					return hardReset(self)()
+				}
+			},
+			Key: 'h',
+		},
+	}
+
+	return self.c.Menu(types.CreateMenuOptions{Title: "", Items: menuItems})
+}
+
+func hardReset(self *FilesController) func() error {
+	return func() error {
 		self.c.LogAction(self.c.Tr.Actions.HardReset)
 		if err := self.c.Git().WorkingTree.ResetHard("HEAD"); err != nil {
 			return err
@@ -152,12 +173,7 @@ func (self *FilesController) createResetMenu() error {
 		return self.c.Refresh(
 			types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}},
 		)
-			},
-			Key: 'h',
-		},
 	}
-
-	return self.c.Menu(types.CreateMenuOptions{Title: "", Items: menuItems})
 }
 
 func (self *FilesController) animateExplosion() {

pkg/i18n/english.go

@@ -457,6 +457,8 @@ type TranslationSet struct {
 	DiscardUntrackedFiles                 string
 	DiscardStagedChanges                  string
 	HardReset                             string
+	HardResetTitle                        string
+	HardResetPrompt                       string
 	BranchDeleteTooltip                   string
 	TagDeleteTooltip                      string
 	Delete                                string
@@ -1544,6 +1546,8 @@ func EnglishTranslationSet() *TranslationSet {
 		DiscardUntrackedFiles:                "Discard untracked files",
 		DiscardStagedChanges:                 "Discard staged changes",
 		HardReset:                            "Hard reset",
+		HardResetTitle:                       "Hard reset",
+		HardResetPrompt:                      "This will also reset the uncommited files",
 		BranchDeleteTooltip:                  "View delete options for local/remote branch.",
 		TagDeleteTooltip:                     "View delete options for local/remote tag.",
 		Delete:                               "Delete",