summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-03-23 12:35:07 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-04-30 13:19:53 +1000
commit43251e727596cca2538548976769e47a1bfc5593 (patch)
tree280e4f0609ca58bbbaeb80446fa0d14a7e58a993 /pkg/gui/controllers.go
parentf08135894344583394240f240377015ea874b03b (diff)
split context common from helper common
Diffstat (limited to 'pkg/gui/controllers.go')
-rw-r--r--pkg/gui/controllers.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go
index f64710a70..b0520c975 100644
--- a/pkg/gui/controllers.go
+++ b/pkg/gui/controllers.go
@@ -40,7 +40,7 @@ func (gui *Gui) resetControllers() {
Host: helpers.NewHostHelper(helperCommon, gui.git),
PatchBuilding: patchBuildingHelper,
Staging: stagingHelper,
- Bisect: helpers.NewBisectHelper(helperCommon, gui.git),
+ Bisect: helpers.NewBisectHelper(helperCommon),
Suggestions: suggestionsHelper,
Files: helpers.NewFilesHelper(helperCommon, gui.git, osCommand),
WorkingTree: helpers.NewWorkingTreeHelper(helperCommon, gui.git, gui.State.Contexts, refsHelper, model, setCommitMessage, getSavedCommitMessage),
@@ -50,7 +50,6 @@ func (gui *Gui) resetControllers() {
MergeConflicts: mergeConflictsHelper,
CherryPick: helpers.NewCherryPickHelper(
helperCommon,
- gui.git,
gui.State.Contexts,
rebaseHelper,
),
@@ -305,7 +304,7 @@ func (gui *Gui) resetControllers() {
)
// this must come last so that we've got our click handlers defined against the context
- listControllerFactory := controllers.NewListControllerFactory(gui.c)
+ listControllerFactory := controllers.NewListControllerFactory(common)
for _, context := range gui.getListContexts() {
controllers.AttachControllers(context, listControllerFactory.Create(context))
}