Remove named return values from prSelectorForCurrentBranch

jtmcg · jtmcg · commit af55acefd10b · 2025-01-07T13:41:53.000-08:00
diff --git a/pkg/cmd/pr/status/status.go b/pkg/cmd/pr/status/status.go
@@ -184,17 +184,17 @@ func statusRun(opts *StatusOptions) error {
 	return nil
 }
 
-func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface, prHeadRef string, rem ghContext.Remotes) (prNumber int, selector string, err error) {
-	selector = prHeadRef
+func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface, prHeadRef string, rem ghContext.Remotes) (int, string, error) {
 	branchConfig, _ := gitClient.ReadBranchConfig(context.Background(), prHeadRef)
 
 	// the branch is configured to merge a special PR head ref
 	prHeadRE := regexp.MustCompile(`^refs/pull/(\d+)/head$`)
 	if m := prHeadRE.FindStringSubmatch(branchConfig.MergeRef); m != nil {
-		prNumber, _ = strconv.Atoi(m[1])
-		return
+		prNumber, err := strconv.Atoi(m[1])
+		return prNumber, prHeadRef, err
 	}
 
+	var err error
 	var branchOwner string
 	if branchConfig.RemoteURL != nil {
 		// the branch merges from a remote specified by URL
@@ -208,6 +208,7 @@ func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface
 		}
 	}
 
+	selector := prHeadRef
 	if branchOwner != "" {
 		if strings.HasPrefix(branchConfig.MergeRef, "refs/heads/") {
 			selector = strings.TrimPrefix(branchConfig.MergeRef, "refs/heads/")
@@ -218,7 +219,7 @@ func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface
 		}
 	}
 
-	return
+	return 0, selector, err
 }
 
 func totalApprovals(pr *api.PullRequest) int {

Original file line number	Diff line number	Diff line change
`@@ -184,17 +184,17 @@ func statusRun(opts *StatusOptions) error {`
`184`	`184`	`return nil`
`185`	`185`	`}`
`186`	`186`
`187`		`-func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface, prHeadRef string, rem ghContext.Remotes) (prNumber int, selector string, err error) {`
`188`		`- selector = prHeadRef`
	`187`	`+func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface, prHeadRef string, rem ghContext.Remotes) (int, string, error) {`
`189`	`188`	`branchConfig, _ := gitClient.ReadBranchConfig(context.Background(), prHeadRef)`
`190`	`189`
`191`	`190`	`// the branch is configured to merge a special PR head ref`
`192`	`191`	prHeadRE := regexp.MustCompile(`^refs/pull/(\d+)/head$`)
`193`	`192`	`if m := prHeadRE.FindStringSubmatch(branchConfig.MergeRef); m != nil {`
`194`		`- prNumber, _ = strconv.Atoi(m[1])`
`195`		`- return`
	`193`	`+ prNumber, err := strconv.Atoi(m[1])`
	`194`	`+ return prNumber, prHeadRef, err`
`196`	`195`	`}`
`197`	`196`
	`197`	`+ var err error`
`198`	`198`	`var branchOwner string`
`199`	`199`	`if branchConfig.RemoteURL != nil {`
`200`	`200`	`// the branch merges from a remote specified by URL`
`@@ -208,6 +208,7 @@ func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
	`211`	`+ selector := prHeadRef`
`211`	`212`	`if branchOwner != "" {`
`212`	`213`	`if strings.HasPrefix(branchConfig.MergeRef, "refs/heads/") {`
`213`	`214`	`selector = strings.TrimPrefix(branchConfig.MergeRef, "refs/heads/")`
`@@ -218,7 +219,7 @@ func prSelectorForCurrentBranch(gitClient *git.Client, baseRepo ghrepo.Interface`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`
`221`		`- return`
	`222`	`+ return 0, selector, err`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`func totalApprovals(pr *api.PullRequest) int {`