Skip to content

Commit 9d88d6a

Browse files
committed
Remove MergeAndRebaseHelper's dependency on RefsHelper
We want to make MergeAndRebaseHelper a dependency of RefsHelper instead.
1 parent 4831951 commit 9d88d6a

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

pkg/gui/controllers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (gui *Gui) resetHelpersAndControllers() {
3131
suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon)
3232
worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper)
3333

34-
rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, refsHelper)
34+
rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon)
3535

3636
setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage })
3737
setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription })

pkg/gui/controllers/helpers/merge_and_rebase_helper.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@ import (
1717
)
1818

1919
type MergeAndRebaseHelper struct {
20-
c *HelperCommon
21-
refsHelper *RefsHelper
20+
c *HelperCommon
2221
}
2322

2423
func NewMergeAndRebaseHelper(
2524
c *HelperCommon,
26-
refsHelper *RefsHelper,
2725
) *MergeAndRebaseHelper {
2826
return &MergeAndRebaseHelper{
29-
c: c,
30-
refsHelper: refsHelper,
27+
c: c,
3128
}
3229
}
3330

0 commit comments

Comments
 (0)