diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 20:42:35 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 20:58:34 +1000 |
commit | e26af258d623db56bd4050d7ebec903410c3fa5b (patch) | |
tree | fca9cd66cd4363438ab213eee02545bcc0918396 /pkg/gui/remote_branches_panel.go | |
parent | 76e5ec6d4571251bc89eb015062c747f45a55edd (diff) |
allow rebasing onto remote branch
Diffstat (limited to 'pkg/gui/remote_branches_panel.go')
-rw-r--r-- | pkg/gui/remote_branches_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index 7e3330d7b..4d92e6f7e 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -93,7 +93,7 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error { if remoteBranch == nil { return nil } - message := fmt.Sprintf("%s '%s/%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.RemoteName, remoteBranch.Name) + message := fmt.Sprintf("%s '%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.FullName()) return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("DeleteRemoteBranch"), message, func(*gocui.Gui, *gocui.View) error { return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error { if err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name); err != nil { @@ -106,7 +106,7 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleRebaseOntoRemoteBranch(g *gocui.Gui, v *gocui.View) error { - selectedBranchName := gui.getSelectedRemoteBranch().Name + selectedBranchName := gui.getSelectedRemoteBranch().FullName() return gui.handleRebaseOntoBranch(selectedBranchName) } @@ -137,7 +137,7 @@ func (gui *Gui) handleCreateResetToRemoteBranchMenu(g *gocui.Gui, v *gocui.View) return nil } - return gui.createResetMenu(fmt.Sprintf("%s/%s", selectedBranch.RemoteName, selectedBranch.Name)) + return gui.createResetMenu(selectedBranch.FullName()) } func (gui *Gui) handleNewBranchOffRemote(g *gocui.Gui, v *gocui.View) error { |