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/branches_panel.go | |
| parent | 1c0da2967c50d6c8992adddf7c94ad2a4e5451e2 (diff) | |
support multiple modes of git pull
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 3317a8ff4..bfe666b65 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -129,8 +129,12 @@ func (gui *Gui) handleGitFetch(g *gocui.Gui, v *gocui.View) error { return err } go func() { - err := gui.fetch(g, v, true) - gui.HandleCredentialsPopup(g, err) + err := gui.fetch(true) + gui.HandleCredentialsPopup(err) + if err == nil { + _ = gui.closeConfirmationPrompt(gui.g, true) + _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC}) + } }() return nil } @@ -321,7 +325,7 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error { return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("MergingTitle"), prompt, func(g *gocui.Gui, v *gocui.View) error { - err := gui.GitCommand.Merge(branchName) + err := gui.GitCommand.Merge(branchName, commands.MergeOpts{}) return gui.handleGenericMergeCommandResult(err) }, nil) } |