diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-11 21:38:59 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 18:47:16 +1000 |
| commit | bea2ae5ff53d16305c3f47ed5dfbc0b4d1d56b05 (patch) | |
| tree | e28ec5da92db5c2d30ba9ffb821d04dc92945462 /pkg/gui/branches_panel.go | |
| parent | f49e4946f24961a71afcd7ab840fc2570fe97c1d (diff) | |
stop pulling in general
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index eedbb619c..042613330 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -399,11 +399,8 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error { _ = gui.createLoaderPanel(gui.g, v, message) 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}) + _ = gui.pullWithMode("ff-only", PullFilesOptions{}) + return } else { if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { _ = gui.surfaceError(err) |