diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-11 21:18:38 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 18:47:16 +1000 |
| commit | fcd5aea04e9799f8cf078b4fe4c6b242a8c9b474 (patch) | |
| tree | d889d51ca64db12ea8044a39d356b7c197b553de /pkg/gui/global_handlers.go | |
| parent | 1c0da2967c50d6c8992adddf7c94ad2a4e5451e2 (diff) | |
support multiple modes of git pull
Diffstat (limited to 'pkg/gui/global_handlers.go')
| -rw-r--r-- | pkg/gui/global_handlers.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go index d66e56021..3f5d59b59 100644 --- a/pkg/gui/global_handlers.go +++ b/pkg/gui/global_handlers.go @@ -6,6 +6,7 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -166,16 +167,21 @@ func (gui *Gui) handleInfoClick(g *gocui.Gui, v *gocui.View) error { return nil } -func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (err error) { - err = gui.GitCommand.Fetch(gui.promptUserForCredential, canAskForCredentials) +func (gui *Gui) fetch(canPromptForCredentials bool) (err error) { + fetchOpts := commands.FetchOptions{} + if canPromptForCredentials { + fetchOpts.PromptUserForCredential = gui.promptUserForCredential + } + + err = gui.GitCommand.Fetch(fetchOpts) - if canAskForCredentials && err != nil && strings.Contains(err.Error(), "exit status 128") { + if canPromptForCredentials && err != nil && strings.Contains(err.Error(), "exit status 128") { colorFunction := color.New(color.FgRed).SprintFunc() coloredMessage := colorFunction(strings.TrimSpace(gui.Tr.SLocalize("PassUnameWrong"))) close := func(g *gocui.Gui, v *gocui.View) error { return nil } - _ = gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Error"), coloredMessage, close, close) + _ = gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("Error"), coloredMessage, close, close) } gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, COMMITS, REMOTES, TAGS}, mode: ASYNC}) |