From 517b7d02839ab87693f19ea571b8bd29f07fd00e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 28 Mar 2020 12:52:45 +1100 Subject: fix up some things with the patch handling stuff --- pkg/gui/branches_panel.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkg/gui/branches_panel.go') diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 72eab93f0..9f3bd0f97 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -351,11 +351,13 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error { if gui.State.Panels.Branches.SelectedLine == 0 { if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil { _ = gui.surfaceError(err) + return } _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC}) } else { if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { _ = gui.surfaceError(err) + return } _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{BRANCHES}}) } -- cgit v1.2.3