From 906a49049e2c10886fbf7f97ffabddd78b975f0e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 28 Mar 2020 09:57:36 +1100 Subject: smart refreshing files --- pkg/gui/merge_panel.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/gui/merge_panel.go') diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index e94d5541c..fa238ccb7 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -261,7 +261,7 @@ func (gui *Gui) renderMergeOptions() error { func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error { gui.State.Panels.Merging.EditHistory = stack.New() - if err := gui.refreshFiles(); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { return err } // it's possible this method won't be called from the merging view so we need to @@ -276,7 +276,7 @@ func (gui *Gui) handleCompleteMerge() error { if err := gui.stageSelectedFile(gui.g); err != nil { return err } - if err := gui.refreshFiles(); err != nil { + if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil { return err } // if we got conflicts after unstashing, we don't want to call any git -- cgit v1.2.3