From 53b1e1211074ceaa3098b607e2dedd8fabad37ff Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 4 Jan 2025 15:19:33 +0100 Subject: [PATCH] Cleanup: use the upstream local variable consistently We need to move it closer to the beginning of the method to use it everywhere. --- pkg/gui/controllers/branches_controller.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index 5a0a87fc6..244092681 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -194,6 +194,10 @@ func (self *BranchesController) GetOnRenderToMain() func() { } func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branch) error { + upstream := lo.Ternary(selectedBranch.RemoteBranchStoredLocally(), + selectedBranch.ShortUpstreamRefName(), + self.c.Tr.UpstreamGenericName) + viewDivergenceItem := &types.MenuItem{ LabelColumns: []string{self.c.Tr.ViewDivergenceFromUpstream}, OnPress: func() error { @@ -204,7 +208,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return self.c.Helpers().SubCommits.ViewSubCommits(helpers.ViewSubCommitsOpts{ Ref: branch, - TitleRef: fmt.Sprintf("%s <-> %s", branch.RefName(), branch.ShortUpstreamRefName()), + TitleRef: fmt.Sprintf("%s <-> %s", branch.RefName(), upstream), RefToShowDivergenceFrom: branch.FullUpstreamRefName(), Context: self.context(), ShowBranchHeads: false, @@ -293,9 +297,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc Key: 's', } - upstream := lo.Ternary(selectedBranch.RemoteBranchStoredLocally(), - selectedBranch.ShortUpstreamRefName(), - self.c.Tr.UpstreamGenericName) upstreamResetOptions := utils.ResolvePlaceholderString( self.c.Tr.ViewUpstreamResetOptions, map[string]string{"upstream": upstream}, @@ -332,7 +333,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc LabelColumns: []string{upstreamRebaseOptions}, OpensMenu: true, OnPress: func() error { - if err := self.c.Helpers().MergeAndRebase.RebaseOntoRef(selectedBranch.ShortUpstreamRefName()); err != nil { + if err := self.c.Helpers().MergeAndRebase.RebaseOntoRef(upstream); err != nil { return err } return nil