mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
Rename RebaseMode to WorkingTreeState
We're about to add more possible values (reverting and cherry-picking), so working tree state seems like a more suitable name.
This commit is contained in:
@ -583,7 +583,7 @@ func (self *RefreshHelper) refreshStateFiles() error {
|
||||
}
|
||||
}
|
||||
|
||||
if self.c.Git().Status.WorkingTreeState() != enums.REBASE_MODE_NONE && conflictFileCount == 0 && prevConflictFileCount > 0 {
|
||||
if self.c.Git().Status.WorkingTreeState() != enums.WORKING_TREE_STATE_NONE && conflictFileCount == 0 && prevConflictFileCount > 0 {
|
||||
self.c.OnUIThread(func() error { return self.mergeAndRebaseHelper.PromptToContinueRebase() })
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user