summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-07 19:19:24 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-09 14:09:53 +1100
commite92076d2c299c8171e972171c174261c6ce62d3b (patch)
treef372a446455f3c0bfa2c96dacc5e03b244487324 /pkg/gui
parentd9089098c3adaa007c1a56468c9da31931877712 (diff)
start removing direct calls to cmd.New from gui
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/commit_message_panel.go11
-rw-r--r--pkg/gui/files_panel.go10
2 files changed, 2 insertions, 19 deletions
diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go
index 32ddb5829..962189d5a 100644
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -14,17 +14,8 @@ func (gui *Gui) handleCommitConfirm() error {
if message == "" {
return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr)
}
- flags := []string{}
- skipHookPrefix := gui.UserConfig.Git.SkipHookPrefix
- if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
- flags = append(flags, "--no-verify")
- }
-
- if gui.UserConfig.Git.Commit.SignOff {
- flags = append(flags, "--signoff")
- }
- cmdObj := gui.GitCommand.Commit.CommitCmdObj(message, strings.Join(flags, " "))
+ cmdObj := gui.GitCommand.Commit.CommitCmdObj(message)
gui.logAction(gui.Tr.Actions.Commit)
_ = gui.returnFromContext()
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index fcf8d021c..045970f05 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -471,17 +471,9 @@ func (gui *Gui) handleCommitEditorPress() error {
return gui.promptToStageAllAndRetry(gui.handleCommitEditorPress)
}
- args := []string{"commit"}
-
- if gui.UserConfig.Git.Commit.SignOff {
- args = append(args, "--signoff")
- }
-
- cmdStr := "git " + strings.Join(args, " ")
-
gui.logAction(gui.Tr.Actions.Commit)
return gui.runSubprocessWithSuspenseAndRefresh(
- gui.GitCommand.Cmd.New(cmdStr),
+ gui.GitCommand.Commit.CommitEditorCmdObj(),
)
}