go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-21 21:47:32 +02:00
Code Issues Releases Activity

Added check to invoke continue/refresh

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

5
pkg/gui/branches_panel.go
View File

@ -108,17 +108,16 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
} }
if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil { 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?", if err := gui.createConfirmationPanel(g, v, "Rebase failed", "Rebasing failed, would you like to resolve it?",
func(g *gocui.Gui, v *gocui.View) error { func(g *gocui.Gui, v *gocui.View) error {
return nil return nil
}, }, func(g *gocui.Gui, v *gocui.View) error {
func(g *gocui.Gui, v *gocui.View) error {
return gui.GitCommand.AbortRebaseBranch() return gui.GitCommand.AbortRebaseBranch()
}); err != nil { }); err != nil {
} }
} }
gui.Log.Println("Reached refresh")
return gui.refreshSidePanels(g) return gui.refreshSidePanels(g)
}, nil) }, nil)
} }

4
pkg/gui/merge_panel.go
View File

@ -256,5 +256,9 @@ func (gui *Gui) handleCompleteMerge(g *gocui.Gui) error {
} }
gui.stageSelectedFile(g) gui.stageSelectedFile(g)
gui.refreshFiles(g) gui.refreshFiles(g)
if rebase, err := gui.GitCommand.IsInRebaseState(); rebase && err == nil {
gui.GitCommand.ContinueRebaseBranch()
gui.refreshSidePanels(g)
}
return gui.switchFocus(g, nil, filesView) return gui.switchFocus(g, nil, filesView)
} }