diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-09-29 20:03:39 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-09-29 20:48:49 +1000 |
| commit | 72af7e41778bca93d82fa668641f515fba1d92bc (patch) | |
| tree | 7e755e857be72205ee99641d5eb5d4556151ad8f /pkg/gui | |
| parent | 1767f91047a35318f6b1e469199c8a7f547f2afc (diff) | |
factor out code from git.go
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/remotes_panel.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 9b11dccb1..2188f9fee 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -53,7 +53,7 @@ func (gui *Gui) genericMergeCommand(command string) error { } return nil } - result := gui.GitCommand.GenericMerge(commandType, command) + result := gui.GitCommand.GenericMergeOrRebaseAction(commandType, command) if err := gui.handleGenericMergeCommandResult(result); err != nil { return err } diff --git a/pkg/gui/remotes_panel.go b/pkg/gui/remotes_panel.go index 2d0827592..e310cebe7 100644 --- a/pkg/gui/remotes_panel.go +++ b/pkg/gui/remotes_panel.go @@ -161,9 +161,9 @@ func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error { gui.State.FetchMutex.Lock() defer gui.State.FetchMutex.Unlock() - if err := gui.GitCommand.FetchRemote(remote.Name); err != nil { - return err - } + // TODO: test this + err := gui.GitCommand.FetchRemote(remote.Name, gui.promptUserForCredential) + gui.handleCredentialsPopup(err) return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}}) }) |