From 4386fcb4e5d984ffbe4c276f63da9e8f39f4b7bc Mon Sep 17 00:00:00 2001
From: nilvng <nilverspace@gmail.com>
Date: Sun, 17 Nov 2024 14:51:27 +1100
Subject: [PATCH] issue #2329: fix the unit tests issue - ensure its backward
 compatible

---
 pkg/cmd/pr/checkout/checkout.go | 42 +++++++++++++++++----------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkg/cmd/pr/checkout/checkout.go b/pkg/cmd/pr/checkout/checkout.go
index 5bb0cc113..0c3cb2571 100644
--- a/pkg/cmd/pr/checkout/checkout.go
+++ b/pkg/cmd/pr/checkout/checkout.go
@@ -76,40 +76,42 @@ func NewCmdCheckout(f *cmdutil.Factory, runF func(*CheckoutOptions) error) *cobr
 }
 
 func checkoutRun(opts *CheckoutOptions) error {
-	baseRepo, err := opts.BaseRepo()
-	if err != nil {
-		return err
-	}
+	var (
+		baseRepo ghrepo.Interface
+		pr       *api.PullRequest
+		err      error
+	)
 
-	var pr *api.PullRequest
-
-	if len(opts.SelectorArg) > 0 {
-
-		findOptions := shared.FindOptions{
+	switch {
+	case opts.SelectorArg != "":
+		pr, baseRepo, err = opts.Finder.Find(shared.FindOptions{
 			Selector: opts.SelectorArg,
-			Fields:   []string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"},
-		}
-		pr0, _, err := opts.Finder.Find(findOptions)
+			Fields: []string{
+				"number",
+				"headRefName", 
+				"headRepository",
+				"headRepositoryOwner",
+				"isCrossRepository",
+				"maintainerCanModify",
+			},
+		})
 		if err != nil {
 			return err
 		}
 
-		pr = pr0
-		
-	} else {
-
+	default:
 		httpClient, err := opts.HttpClient()
 		if err != nil {
 			return err
 		}
 
-		pr0, err := selectPR(httpClient, baseRepo, opts.Prompter, opts.IO.ColorScheme())
-		if err != nil {
+		if baseRepo, err = opts.BaseRepo(); err != nil {
 			return err
 		}
 
-		pr = pr0
-
+		if pr, err = selectPR(httpClient, baseRepo, opts.Prompter, opts.IO.ColorScheme()); err != nil {
+			return err
+		}
 	}
 	cfg, err := opts.Config()
 	if err != nil {