summaryrefslogtreecommitdiffstats
path: root/pkg/gui/branches_panel.go
diff options
context:
space:
mode:
authorGlenn Vriesman <glenn.vriesman@gmail.com>2018-12-02 17:34:15 +0100
committerJesse Duffield <jessedduffield@gmail.com>2018-12-11 09:39:54 +1100
commite39d2ed44bc8cc187abe3cd59349c40ca126b7a6 (patch)
treec1081965295fc91341125bef261599c7e742bf03 /pkg/gui/branches_panel.go
parent7a7e88577341f314ff54ef50474390f1f94d4b91 (diff)
Added check to invoke continue/refresh
Diffstat (limited to 'pkg/gui/branches_panel.go')
-rw-r--r--pkg/gui/branches_panel.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index ce1649f64..7252665f9 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -108,17 +108,16 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
}
if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil {
+ gui.Log.Errorln(err)
if err := gui.createConfirmationPanel(g, v, "Rebase failed", "Rebasing failed, would you like to resolve it?",
func(g *gocui.Gui, v *gocui.View) error {
return nil
- },
- func(g *gocui.Gui, v *gocui.View) error {
+ }, func(g *gocui.Gui, v *gocui.View) error {
return gui.GitCommand.AbortRebaseBranch()
}); err != nil {
}
}
- gui.Log.Println("Reached refresh")
return gui.refreshSidePanels(g)
}, nil)
}