go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

better logic for checking if we're rebasing

Browse Source
This commit is contained in:
Jesse Duffield
2020-02-25 22:00:20 +11:00
parent 02c497fad6
commit e6a8dc0bcf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/gui/status_panel.go
View File

@ -136,14 +136,6 @@ func lazygitTitle() string {
} }
func (gui *Gui) updateWorkTreeState() error { func (gui *Gui) updateWorkTreeState() error {
merging, err := gui.GitCommand.IsInMergeState()
if err != nil {
return err
}
if merging {
gui.State.WorkingTreeState = "merging"
return nil
}
rebaseMode, err := gui.GitCommand.RebaseMode() rebaseMode, err := gui.GitCommand.RebaseMode()
if err != nil { if err != nil {
return err return err
@ -152,6 +144,14 @@ func (gui *Gui) updateWorkTreeState() error {
gui.State.WorkingTreeState = "rebasing" gui.State.WorkingTreeState = "rebasing"
return nil return nil
} }
merging, err := gui.GitCommand.IsInMergeState()
if err != nil {
return err
}
if merging {
gui.State.WorkingTreeState = "merging"
return nil
}
gui.State.WorkingTreeState = "normal" gui.State.WorkingTreeState = "normal"
return nil return nil
} }