From 2d18d089ce046e7f858b8d1e41469350f879d49c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 11 Aug 2020 21:52:43 +1000 Subject: allow entering a password when fast forwarding another branch --- pkg/gui/branches_panel.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkg/gui/branches_panel.go') diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 1341702f7..ed8e7819e 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -400,16 +400,11 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error { if gui.State.Panels.Branches.SelectedLine == 0 { _ = gui.pullWithMode("ff-only", PullFilesOptions{}) - return } else { - if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { - _ = gui.surfaceError(err) - return - } + err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName, gui.promptUserForCredential) + gui.handleCredentialsPopup(err) _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{BRANCHES}}) } - - _ = gui.closeConfirmationPrompt(gui.g, true) }() return nil } -- cgit v1.2.3