diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-11 23:22:09 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-11 23:30:30 +1100 |
commit | 12b84307acd67c93122d1fb971effb9700524592 (patch) | |
tree | 8ba62a274804a85c78898fa11dd2e6797893b9bc /pkg/gui/confirmation_panel.go | |
parent | 6843741d9e86bee57c96023a0c66e08cd43b3474 (diff) |
specify upstream when pushing a branch for the first timev0.10.4
Diffstat (limited to 'pkg/gui/confirmation_panel.go')
-rw-r--r-- | pkg/gui/confirmation_panel.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index 6913400a1..f9e2dbfbd 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -64,13 +64,16 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, wrap bool, prompt s height/2 + panelHeight/2 } -func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, handleConfirm func(*gocui.Gui, *gocui.View) error) error { +func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, initialContent string, handleConfirm func(*gocui.Gui, *gocui.View) error) error { gui.onNewPopupPanel() - confirmationView, err := gui.prepareConfirmationPanel(currentView, title, "", false) + confirmationView, err := gui.prepareConfirmationPanel(currentView, title, initialContent, false) if err != nil { return err } confirmationView.Editable = true + if err := gui.renderString(g, "confirmation", initialContent); err != nil { + return err + } // in the future we might want to give createPromptPanel the returnFocusOnClose arg too, but for now we're always setting it to true return gui.setKeyBindings(g, handleConfirm, nil, true) } |