diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:52:45 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | 517b7d02839ab87693f19ea571b8bd29f07fd00e (patch) | |
| tree | 7ecdba06d030bcf8473c684b4fdd7a4a5c19875c /pkg/gui/branches_panel.go | |
| parent | 0c0231c3e835ef93a7fe06a95c28bd00f1da6631 (diff) | |
fix up some things with the patch handling stuff
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 2 |
1 files changed, 2 insertions, 0 deletions
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}}) } |