diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-11 21:52:43 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 18:47:16 +1000 |
| commit | 2d18d089ce046e7f858b8d1e41469350f879d49c (patch) | |
| tree | ccff65027a69cdd4aaf4e3577057618965b013d1 /pkg/gui/branches_panel.go | |
| parent | 9c7e40906dd52c7077e06d226b31b6afb21727d7 (diff) | |
allow entering a password when fast forwarding another branch
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 9 |
1 files changed, 2 insertions, 7 deletions
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 } |