From 9d88d6a44e2c1d3df9dd2996a951d57ebf86a6d5 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Wed, 2 Apr 2025 15:01:52 +0200 Subject: [PATCH] Remove MergeAndRebaseHelper's dependency on RefsHelper We want to make MergeAndRebaseHelper a dependency of RefsHelper instead. --- pkg/gui/controllers.go | 2 +- pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go index e6f6bbb4e..14c8882b9 100644 --- a/pkg/gui/controllers.go +++ b/pkg/gui/controllers.go @@ -31,7 +31,7 @@ func (gui *Gui) resetHelpersAndControllers() { suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon) worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper) - rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, refsHelper) + rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon) setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage }) setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription }) diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index d5efc72ca..079e2ab68 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -17,17 +17,14 @@ import ( ) type MergeAndRebaseHelper struct { - c *HelperCommon - refsHelper *RefsHelper + c *HelperCommon } func NewMergeAndRebaseHelper( c *HelperCommon, - refsHelper *RefsHelper, ) *MergeAndRebaseHelper { return &MergeAndRebaseHelper{ - c: c, - refsHelper: refsHelper, + c: c, } }