diff options
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index e4e7a432f..a683a2342 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -372,12 +372,19 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error { go func() { _ = gui.createLoaderPanel(gui.g, v, message) - if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { - _ = gui.createErrorPanel(gui.g, err.Error()) + if gui.State.Panels.Branches.SelectedLine == 0 { + if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil { + _ = gui.createErrorPanel(gui.g, err.Error()) + } + _ = gui.refreshSidePanels(gui.g) } else { - _ = gui.closeConfirmationPrompt(gui.g, true) + if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { + _ = gui.createErrorPanel(gui.g, err.Error()) + } _ = gui.RenderSelectedBranchUpstreamDifferences() } + + _ = gui.closeConfirmationPrompt(gui.g, true) }() return nil } |