Add option to disable warning when amending last commit (#4640)

- **PR Description**
Add an option in the User Config to disable the warning message when
amending the last commit.

Fixes #4636

Author: stefanhaller

docs/Config.md

@@ -72,6 +72,9 @@ gui:
   # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
   mouseEvents: true
 
+  # If true, do not show a warning when amending a commit.
+  skipAmendWarning: false
+
   # If true, do not show a warning when discarding changes in the staging view.
   skipDiscardChangeWarning: false
 

pkg/config/app_config_test.go

@@ -384,6 +384,9 @@ gui:
   # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
   mouseEvents: true
 
+  # If true, do not show a warning when amending a commit.
+  skipAmendWarning: false
+
   # If true, do not show a warning when discarding changes in the staging view.
   skipDiscardChangeWarning: false
 

pkg/config/user_config.go

@@ -74,6 +74,8 @@ type GuiConfig struct {
 	// If true, capture mouse events.
 	// When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
 	MouseEvents bool `yaml:"mouseEvents"`
+	// If true, do not show a warning when amending a commit.
+	SkipAmendWarning bool `yaml:"skipAmendWarning"`
 	// If true, do not show a warning when discarding changes in the staging view.
 	SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
 	// If true, do not show warning when applying/popping the stash
@@ -734,6 +736,7 @@ func GetDefaultConfig() *UserConfig {
 			ScrollOffBehavior:        "margin",
 			TabWidth:                 4,
 			MouseEvents:              true,
+			SkipAmendWarning:         false,
 			SkipDiscardChangeWarning: false,
 			SkipStashWarning:         false,
 			SidePanelWidth:           0.3333,

pkg/gui/controllers/files_controller.go

@@ -795,17 +795,19 @@ func (self *FilesController) handleAmendCommitPress() error {
 				},
 			},
 		})
-	} else {
+	} else if !self.c.UserConfig().Gui.SkipAmendWarning {
 		self.c.Confirm(types.ConfirmOpts{
 			Title:  self.c.Tr.AmendLastCommitTitle,
 			Prompt: self.c.Tr.SureToAmend,
 			HandleConfirm: func() error {
 				return doAmend()
 			},
 		})
+
+		return nil
 	}
 
-	return nil
+	return doAmend()
 }
 
 func (self *FilesController) isResolvingConflicts() bool {

pkg/gui/controllers/local_commits_controller.go

@@ -717,35 +717,37 @@ func (self *LocalCommitsController) moveUp(selectedCommits []*models.Commit, sta
 }
 
 func (self *LocalCommitsController) amendTo(commit *models.Commit) error {
-	if self.isSelectedHeadCommit() {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.AmendCommitTitle,
-			Prompt: self.c.Tr.AmendCommitPrompt,
-			HandleConfirm: func() error {
-				return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error {
-					if err := self.c.Helpers().AmendHelper.AmendHead(); err != nil {
-						return err
-					}
-					return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
-				})
-			},
-		})
+	var handleCommit func() error
 
-		return nil
-	}
-
-	self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.AmendCommitTitle,
-		Prompt: self.c.Tr.AmendCommitPrompt,
-		HandleConfirm: func() error {
+	if self.isSelectedHeadCommit() {
+		handleCommit = func() error {
+			return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error {
+				if err := self.c.Helpers().AmendHelper.AmendHead(); err != nil {
+					return err
+				}
+				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
+			})
+		}
+	} else {
+		handleCommit = func() error {
 			return self.c.Helpers().WorkingTree.WithEnsureCommittableFiles(func() error {
 				return self.c.WithWaitingStatus(self.c.Tr.AmendingStatus, func(gocui.Task) error {
 					self.c.LogAction(self.c.Tr.Actions.AmendCommit)
 					err := self.c.Git().Rebase.AmendTo(self.c.Model().Commits, self.context().GetView().SelectedLineIdx())
 					return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
 				})
 			})
-		},
+		}
+	}
+
+	if self.c.UserConfig().Gui.SkipAmendWarning {
+		return handleCommit()
+	}
+
+	self.c.Confirm(types.ConfirmOpts{
+		Title:         self.c.Tr.AmendCommitTitle,
+		Prompt:        self.c.Tr.AmendCommitPrompt,
+		HandleConfirm: handleCommit,
 	})
 
 	return nil

schema/config.json

@@ -468,6 +468,11 @@
           "description": "If true, capture mouse events.\nWhen mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.",
           "default": true
         },
+        "skipAmendWarning": {
+          "type": "boolean",
+          "description": "If true, do not show a warning when amending a commit.",
+          "default": false
+        },
         "skipDiscardChangeWarning": {
           "type": "boolean",
           "description": "If true, do not show a warning when discarding changes in the staging view.",