diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-08 13:19:38 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-08 18:44:15 +1100 |
| commit | 19146d61b1d16f93242d803652c1ed3c4dc24689 (patch) | |
| tree | fc9105c7013fb04bb0b7dd705f608a55157646f5 /pkg/gui | |
| parent | e541b809ce0c7062c46368082224716d90696993 (diff) | |
use selected branch as base when creating a new branch
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/branches_panel.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 90d8a2758..44cd9415b 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -220,7 +220,10 @@ func (gui *Gui) getCheckedOutBranch() *commands.Branch { } func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error { - branch := gui.getCheckedOutBranch() + branch := gui.getSelectedBranch() + if branch == nil { + return nil + } message := gui.Tr.TemplateLocalize( "NewBranchNameBranchOff", Teml{ @@ -228,7 +231,7 @@ func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error { }, ) gui.createPromptPanel(g, v, message, "", func(g *gocui.Gui, v *gocui.View) error { - if err := gui.GitCommand.NewBranch(gui.trimmedContent(v)); err != nil { + if err := gui.GitCommand.NewBranch(gui.trimmedContent(v), branch.Name); err != nil { return gui.createErrorPanel(g, err.Error()) } gui.refreshSidePanels(g) |