From a2c780b085b4b5fecf387d4f848d562494ab51cc Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 23 Mar 2019 12:16:55 +1100 Subject: retain commit message if precommit hook fails --- pkg/gui/files_panel.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkg/gui/files_panel.go') diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 728ad2f97..843286e9e 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -328,9 +328,13 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro question := gui.Tr.SLocalize("SureToAmend") return gui.createConfirmationPanel(g, filesView, title, question, func(g *gocui.Gui, v *gocui.View) error { - if err := gui.runSyncOrAsyncCommand(gui.GitCommand.AmendHead()); err != nil { + ok, err := gui.runSyncOrAsyncCommand(gui.GitCommand.AmendHead()) + if err != nil { return err } + if !ok { + return nil + } return gui.refreshSidePanels(g) }, nil) @@ -355,7 +359,8 @@ func (gui *Gui) PrepareSubProcess(g *gocui.Gui, commands ...string) { } func (gui *Gui) editFile(filename string) error { - return gui.runSyncOrAsyncCommand(gui.OSCommand.EditFile(filename)) + _, err := gui.runSyncOrAsyncCommand(gui.OSCommand.EditFile(filename)) + return err } func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error { -- cgit v1.2.3