Cleanup: remove unnecessary indirection

stefanhaller · stefanhaller · commit ecc70f47647a · 2025-04-21T18:12:50.000+02:00
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -277,7 +277,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
 		disabledReason = &types.DisabledReason{Text: self.c.Tr.CantRebaseOntoSelf}
 	}
 
-	baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(checkedOutBranch, self.refsHelper.c.Model().MainBranches)
+	baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(checkedOutBranch, self.c.Model().MainBranches)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {`
`277`	`277`	`disabledReason = &types.DisabledReason{Text: self.c.Tr.CantRebaseOntoSelf}`
`278`	`278`	`}`
`279`	`279`
`280`		`- baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(checkedOutBranch, self.refsHelper.c.Model().MainBranches)`
	`280`	`+ baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(checkedOutBranch, self.c.Model().MainBranches)`
`281`	`281`	`if err != nil {`
`282`	`282`	`return err`
`283`	`283`	`}`