repo fork: honor --remote with repo arg

VedantMadane · VedantMadane · commit b51569987116 · 2026-02-10T17:17:28.000+05:30
diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go
@@ -182,6 +182,14 @@ func forkRun(opts *ForkOptions) error {
 				return fmt.Errorf("argument error: %w", err)
 			}
 		}
+
+		if opts.Remote {
+			if remotes, err := opts.Remotes(); err == nil {
+				if _, err := remotes.FindByRepo(repoToFork.RepoOwner(), repoToFork.RepoName()); err == nil {
+					inParent = true
+				}
+			}
+		}
 	}
 
 	connectedToTerminal := opts.IO.IsStdoutTTY() && opts.IO.IsStderrTTY() && opts.IO.IsStdinTTY()
diff --git a/pkg/cmd/repo/fork/fork_test.go b/pkg/cmd/repo/fork/fork_test.go
@@ -372,6 +372,22 @@ func TestRepoFork(t *testing.T) {
 			},
 			wantErrOut: "✓ Created fork someone/REPO\n✓ Renamed remote origin to upstream\n✓ Added remote origin\n",
 		},
+		{
+			name: "repo arg matches remote --remote",
+			tty:  true,
+			opts: &ForkOptions{
+				Repository: "https://github.com/OWNER/REPO.git",
+				Remote:     true,
+				RemoteName: defaultRemoteName,
+				Rename:     true,
+			},
+			httpStubs: forkPost,
+			execStubs: func(cs *run.CommandStubber) {
+				cs.Register("git remote rename origin upstream", 0, "")
+				cs.Register(`git remote add origin https://github.com/someone/REPO.git`, 0, "")
+			},
+			wantErrOut: "✓ Created fork someone/REPO\n✓ Renamed remote origin to upstream\n✓ Added remote origin\n",
+		},
 		{
 			name: "implicit nontty reuse existing remote",
 			opts: &ForkOptions{

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,14 @@ func forkRun(opts *ForkOptions) error {`
`182`	`182`	`return fmt.Errorf("argument error: %w", err)`
`183`	`183`	`}`
`184`	`184`	`}`
	`185`	`+`
	`186`	`+ if opts.Remote {`
	`187`	`+ if remotes, err := opts.Remotes(); err == nil {`
	`188`	`+ if _, err := remotes.FindByRepo(repoToFork.RepoOwner(), repoToFork.RepoName()); err == nil {`
	`189`	`+ inParent = true`
	`190`	`+ }`
	`191`	`+ }`
	`192`	`+ }`
`185`	`193`	`}`
`186`	`194`
`187`	`195`	`connectedToTerminal := opts.IO.IsStdoutTTY() && opts.IO.IsStderrTTY() && opts.IO.IsStdinTTY()`