go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-24 08:52:21 +02:00
Code Issues Releases Activity

Making ci happier

Browse Source
This commit is contained in:
Glenn Vriesman 2018-12-02 17:47:42 +01:00 committed by Jesse Duffield
parent e39d2ed44b
commit cce6f405a5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/gui/branches_panel.go
View File

@ -115,6 +115,7 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
}, func(g *gocui.Gui, v *gocui.View) error {
return gui.GitCommand.AbortRebaseBranch()
}); err != nil {
gui.Log.Errorln(err)
}
}

8
pkg/gui/merge_panel.go
View File

@ -257,8 +257,12 @@ func (gui *Gui) handleCompleteMerge(g *gocui.Gui) error {
gui.stageSelectedFile(g)
gui.refreshFiles(g)
if rebase, err := gui.GitCommand.IsInRebaseState(); rebase && err == nil {
gui.GitCommand.ContinueRebaseBranch()
gui.refreshSidePanels(g)
if err := gui.GitCommand.ContinueRebaseBranch(); err != nil {
gui.Log.Errorln(err)
}
if err := gui.refreshSidePanels(g); err != nil {
gui.Log.Errorln(err)
}
}
return gui.switchFocus(g, nil, filesView)
}