guard for edge case of deleted PR

Author: skarim

cmd/push_test.go

@@ -84,7 +84,17 @@ func TestPush_NoSubmitHintWhenPRsExist(t *testing.T) {
 	defer restore()
 
 	cfg, _, errR := config.NewTestConfig()
-	cfg.GitHubClientOverride = &github.MockClient{}
+	cfg.GitHubClientOverride = &github.MockClient{
+		FindPRByNumberFn: func(number int) (*github.PullRequest, error) {
+			switch number {
+			case 10:
+				return &github.PullRequest{Number: 10, State: "OPEN", HeadRefName: "b1"}, nil
+			case 11:
+				return &github.PullRequest{Number: 11, State: "OPEN", HeadRefName: "b2"}, nil
+			}
+			return nil, nil
+		},
+	}
 	cmd := PushCmd(cfg)
 	cmd.SetOut(io.Discard)
 	cmd.SetErr(io.Discard)

cmd/utils.go

@@ -269,24 +269,31 @@ func syncStackPRs(cfg *config.Config, s *stack.Stack) {
 		if b.PullRequest != nil && b.PullRequest.Number != 0 {
 			// Tracked PR — refresh its state.
 			pr, err := client.FindPRByNumber(b.PullRequest.Number)
-			if err != nil || pr == nil {
-				continue
-			}
-			b.PullRequest = &stack.PullRequestRef{
-				Number: pr.Number,
-				ID:     pr.ID,
-				URL:    pr.URL,
-				Merged: pr.Merged,
+			if err != nil {
+				continue // API error — keep existing tracked PR
 			}
-			b.Queued = pr.IsQueued()
-
-			// If the PR was closed (not merged), remove the association
-			// so we fall through to the open-PR lookup below.
-			if pr.State == "CLOSED" {
+			if pr == nil {
+				// PR not found — clear stale ref and fall through
+				// to the open-PR lookup below.
 				b.PullRequest = nil
 				b.Queued = false
 			} else {
-				continue
+				b.PullRequest = &stack.PullRequestRef{
+					Number: pr.Number,
+					ID:     pr.ID,
+					URL:    pr.URL,
+					Merged: pr.Merged,
+				}
+				b.Queued = pr.IsQueued()
+
+				// If the PR was closed (not merged), remove the association
+				// so we fall through to the open-PR lookup below.
+				if pr.State == "CLOSED" {
+					b.PullRequest = nil
+					b.Queued = false
+				} else {
+					continue
+				}
 			}
 		}