IntenseFinance/lazygit
3
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Error handling

Browse Source
This commit is contained in:
Glenn Vriesman
2018-12-02 14:16:13 +01:00
committed by Jesse Duffield
parent a1ee11e54e
commit 34fd18a395
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/branches_panel.go
View File

@@ -106,13 +106,19 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
if selectedBranch == checkedOutBranch {
return gui.createErrorPanel(g, gui.Tr.SLocalize("CantRebaseOntoSelf"))
}
if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil {
if err := gui.createErrorPanel(g, "Failed to rebase"); err != nil {
gui.Log.Println(err.Error())
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 {
return gui.GitCommand.AbortRebaseBranch()
}); err != nil {
}
return gui.GitCommand.AbortRebaseBranch()
}
gui.Log.Println("Reached refresh")
return gui.refreshSidePanels(g)
}, nil)
}