From a2790cfe8e6705ebd81c63df2154ec82cb645ae3 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 29 Mar 2020 10:11:15 +1100 Subject: rename to filtered mode --- pkg/gui/branches_panel.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/gui/branches_panel.go') diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 3d1692844..c7cba8aea 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -263,7 +263,7 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c } func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error { - if ok, err := gui.validateNotInScopedMode(); err != nil || !ok { + if ok, err := gui.validateNotInFilterMode(); err != nil || !ok { return err } @@ -290,7 +290,7 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error { } func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error { - if ok, err := gui.validateNotInScopedMode(); err != nil || !ok { + if ok, err := gui.validateNotInFilterMode(); err != nil || !ok { return err } @@ -304,7 +304,7 @@ func (gui *Gui) handleRebaseOntoLocalBranch(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error { - if ok, err := gui.validateNotInScopedMode(); err != nil || !ok { + if ok, err := gui.validateNotInFilterMode(); err != nil || !ok { return err } -- cgit v1.2.3