diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index 97a1ffeac..b3a5bf38c 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/pkg/gui/controllers/basic_commits_controller.go @@ -361,7 +361,7 @@ func (self *BasicCommitsController) newBranch(commit *models.Commit) error { } func (self *BasicCommitsController) createResetMenu(commit *models.Commit) error { - return self.c.Helpers().Refs.CreateGitResetMenu(commit.Hash()) + return self.c.Helpers().Refs.CreateGitResetMenu(commit.Hash(), commit.Hash()) } func (self *BasicCommitsController) checkout(commit *models.Commit) error { diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index b3ce28ab8..4b5318dcb 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -326,7 +326,8 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc LabelColumns: []string{upstreamResetOptions}, OpensMenu: true, OnPress: func() error { - err := self.c.Helpers().Refs.CreateGitResetMenu(upstream) + // We only can invoke this when the remote branch is stored locally, so using the selectedBranch here is fine. + err := self.c.Helpers().Refs.CreateGitResetMenu(upstream, selectedBranch.FullUpstreamRefName()) if err != nil { return err } @@ -686,7 +687,7 @@ func (self *BranchesController) createSortMenu() error { } func (self *BranchesController) createResetMenu(selectedBranch *models.Branch) error { - return self.c.Helpers().Refs.CreateGitResetMenu(selectedBranch.Name) + return self.c.Helpers().Refs.CreateGitResetMenu(selectedBranch.Name, selectedBranch.FullRefName()) } func (self *BranchesController) rename(branch *models.Branch) error { diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 6df28a523..211232b13 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -1144,7 +1144,7 @@ func (self *FilesController) stash() error { } func (self *FilesController) createResetToUpstreamMenu() error { - return self.c.Helpers().Refs.CreateGitResetMenu("@{upstream}") + return self.c.Helpers().Refs.CreateGitResetMenu("@{upstream}", "@{upstream}") } func (self *FilesController) handleToggleDirCollapsed() error { diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index b69a68c79..8936a1d61 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -231,7 +231,7 @@ func (self *RefsHelper) CreateSortOrderMenu(sortOptionsOrder []string, onSelecte }) } -func (self *RefsHelper) CreateGitResetMenu(ref string) error { +func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error { type strengthWithKey struct { strength string label string @@ -249,7 +249,7 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error { return &types.MenuItem{ LabelColumns: []string{ row.label, - style.FgRed.Sprintf("reset --%s %s", row.strength, ref), + style.FgRed.Sprintf("reset --%s %s", row.strength, name), }, OnPress: func() error { self.c.LogAction("Reset") @@ -261,7 +261,7 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error { }) return self.c.Menu(types.CreateMenuOptions{ - Title: fmt.Sprintf("%s %s", self.c.Tr.ResetTo, ref), + Title: fmt.Sprintf("%s %s", self.c.Tr.ResetTo, name), Items: menuItems, }) } diff --git a/pkg/gui/controllers/remote_branches_controller.go b/pkg/gui/controllers/remote_branches_controller.go index 39e09a12a..1d59b5547 100644 --- a/pkg/gui/controllers/remote_branches_controller.go +++ b/pkg/gui/controllers/remote_branches_controller.go @@ -158,7 +158,7 @@ func (self *RemoteBranchesController) createSortMenu() error { } func (self *RemoteBranchesController) createResetMenu(selectedBranch *models.RemoteBranch) error { - return self.c.Helpers().Refs.CreateGitResetMenu(selectedBranch.FullName()) + return self.c.Helpers().Refs.CreateGitResetMenu(selectedBranch.FullName(), selectedBranch.FullRefName()) } func (self *RemoteBranchesController) setAsUpstream(selectedBranch *models.RemoteBranch) error { diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index 664a0f279..5ce674d91 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/pkg/gui/controllers/tags_controller.go @@ -302,7 +302,7 @@ func (self *TagsController) push(tag *models.Tag) error { } func (self *TagsController) createResetMenu(tag *models.Tag) error { - return self.c.Helpers().Refs.CreateGitResetMenu(tag.Name) + return self.c.Helpers().Refs.CreateGitResetMenu(tag.Name, tag.FullRefName()) } func (self *TagsController) create() error {