summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers/cherry_pick_helper.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-03-23 12:53:18 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-04-30 13:19:53 +1000
commitfc91ef6a59e3cf8336b1cef78c210907c08a4cda (patch)
tree7a79860d3afbd04fc00c2b8be82b7c137299bbaa /pkg/gui/controllers/helpers/cherry_pick_helper.go
parent43251e727596cca2538548976769e47a1bfc5593 (diff)
standardise helper args
Diffstat (limited to 'pkg/gui/controllers/helpers/cherry_pick_helper.go')
-rw-r--r--pkg/gui/controllers/helpers/cherry_pick_helper.go11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkg/gui/controllers/helpers/cherry_pick_helper.go b/pkg/gui/controllers/helpers/cherry_pick_helper.go
index 695a726ae..2c9b7c7c9 100644
--- a/pkg/gui/controllers/helpers/cherry_pick_helper.go
+++ b/pkg/gui/controllers/helpers/cherry_pick_helper.go
@@ -2,7 +2,6 @@ package helpers
import (
"github.com/jesseduffield/lazygit/pkg/commands/models"
- "github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking"
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
@@ -10,8 +9,6 @@ import (
type CherryPickHelper struct {
c *HelperCommon
- contexts *context.ContextTree
-
rebaseHelper *MergeAndRebaseHelper
}
@@ -20,12 +17,10 @@ type CherryPickHelper struct {
func NewCherryPickHelper(
c *HelperCommon,
- contexts *context.ContextTree,
rebaseHelper *MergeAndRebaseHelper,
) *CherryPickHelper {
return &CherryPickHelper{
c: c,
- contexts: contexts,
rebaseHelper: rebaseHelper,
}
}
@@ -111,9 +106,9 @@ func (self *CherryPickHelper) resetIfNecessary(context types.Context) error {
func (self *CherryPickHelper) rerender() error {
for _, context := range []types.Context{
- self.contexts.LocalCommits,
- self.contexts.ReflogCommits,
- self.contexts.SubCommits,
+ self.c.Contexts().LocalCommits,
+ self.c.Contexts().ReflogCommits,
+ self.c.Contexts().SubCommits,
} {
if err := self.c.PostRefreshUpdate(context); err != nil {
return err