sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-12 23:41:54 +03:00
Code Activity

Move types/enums/enums.go to working_tree_state.go

Browse Source 
It looks like enums.go was supposed to be file that collects a bunch of enums,
but actually there's only one in there, and since it has methods, it deserves to
be in a file of its own, named after the type.
This commit is contained in:
Stefan Haller
2025-04-07 10:44:11 +02:00
parent e1eb95b2b3
commit 8af8f7754b
16 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/git_commands/patch.go
View File

@ -8,7 +8,6 @@ import (
"github.com/jesseduffield/lazygit/pkg/app/daemon"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/patch"
"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
"github.com/stefanhaller/git-todo-parser/todo"
)
@ -229,7 +228,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
}
if err := self.ApplyCustomPatch(true, true); err != nil {
if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
_ = self.rebase.AbortRebase()
}
return err
@ -253,7 +252,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
self.rebase.onSuccessfulContinue = func() error {
// add patches to index
if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
if self.status.WorkingTreeState() == enums.WORKING_TREE_STATE_REBASING {
if self.status.WorkingTreeState() == models.WORKING_TREE_STATE_REBASING {
_ = self.rebase.AbortRebase()
}
return err