diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-16 20:38:26 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-18 08:36:19 +1100 |
commit | 682db77401e5c44de1eeeb179afd0114bfe82f72 (patch) | |
tree | 1dbdadd56b6e893550565da86fe37cb0a40be30d /pkg/commands/patch_rebases.go | |
parent | 6faed08d9de2841788b1eac4077862bc4ae682f1 (diff) |
fix lint errors
Diffstat (limited to 'pkg/commands/patch_rebases.go')
-rw-r--r-- | pkg/commands/patch_rebases.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/commands/patch_rebases.go b/pkg/commands/patch_rebases.go index 42e03f1e9..2c3b5b1d3 100644 --- a/pkg/commands/patch_rebases.go +++ b/pkg/commands/patch_rebases.go @@ -149,7 +149,7 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*models.Commit, commitIdx int, } if err := p.ApplyPatches(true); err != nil { - if c.WorkingTreeState() == "rebasing" { + if c.WorkingTreeState() == REBASE_MODE_REBASING { if err := c.GenericMergeOrRebaseAction("rebase", "abort"); err != nil { return err } @@ -169,7 +169,7 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*models.Commit, commitIdx int, c.onSuccessfulContinue = func() error { // add patches to index if err := p.ApplyPatches(false); err != nil { - if c.WorkingTreeState() == "rebasing" { + if c.WorkingTreeState() == REBASE_MODE_REBASING { if err := c.GenericMergeOrRebaseAction("rebase", "abort"); err != nil { return err } |