Merge pull request #2384 from stefanhaller/disable-reword-in-editor-prompt

docs/Config.md

@@ -61,6 +61,7 @@ gui:
   showIcons: false
   commandLogSize: 8
   splitDiff: 'auto' # one of 'auto' | 'always'
+  skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor
 git:
   paging:
     colorArg: always

pkg/config/user_config.go

@@ -50,6 +50,7 @@ type GuiConfig struct {
 	ShowIcons                 bool               `yaml:"showIcons"`
 	CommandLogSize            int                `yaml:"commandLogSize"`
 	SplitDiff                 string             `yaml:"splitDiff"`
+	SkipRewordInEditorWarning bool               `yaml:"skipRewordInEditorWarning"`
 }
 
 type ThemeConfig struct {
@@ -378,6 +379,7 @@ func GetDefaultConfig() *UserConfig {
 			ShowIcons:                 false,
 			CommandLogSize:            8,
 			SplitDiff:                 "auto",
+			SkipRewordInEditorWarning: false,
 		},
 		Git: GitConfig{
 			Paging: PagingConfig{

pkg/gui/controllers/local_commits_controller.go

@@ -226,19 +226,7 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error {
 	})
 }
 
-func (self *LocalCommitsController) rewordEditor(commit *models.Commit) error {
+func (self *LocalCommitsController) doRewordEditor() error {
-	midRebase, err := self.handleMidRebaseCommand("reword", commit)
-	if err != nil {
-		return err
-	}
-	if midRebase {
-		return nil
-	}
-
-	return self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.RewordInEditorTitle,
-		Prompt: self.c.Tr.RewordInEditorPrompt,
-		HandleConfirm: func() error {
 	self.c.LogAction(self.c.Tr.Actions.RewordCommit)
 
 	if self.context().GetSelectedLineIdx() == 0 {
@@ -256,8 +244,26 @@ func (self *LocalCommitsController) rewordEditor(commit *models.Commit) error {
 	}
 
 	return nil
-		},
+}
+
+func (self *LocalCommitsController) rewordEditor(commit *models.Commit) error {
+	midRebase, err := self.handleMidRebaseCommand("reword", commit)
+	if err != nil {
+		return err
+	}
+	if midRebase {
+		return nil
+	}
+
+	if self.c.UserConfig.Gui.SkipRewordInEditorWarning {
+		return self.doRewordEditor()
+	} else {
+		return self.c.Confirm(types.ConfirmOpts{
+			Title:         self.c.Tr.RewordInEditorTitle,
+			Prompt:        self.c.Tr.RewordInEditorPrompt,
+			HandleConfirm: self.doRewordEditor,
 		})
+	}
 }
 
 func (self *LocalCommitsController) drop(commit *models.Commit) error {