From 3f0044fd94ace79714ee93df89b5efbd5b8bf242 Mon Sep 17 00:00:00 2001
From: majiayu000 <1835304752@qq.com>
Date: Fri, 26 Dec 2025 14:43:52 +0800
Subject: [PATCH] fix: error when --remote flag used with repo argument

When a repository argument is provided to `gh repo fork`, the command
operates independently of the current local repository. Using --remote
in this context is incompatible because there's no local repository to
add the remote to.

This change returns an explicit error when these flags are combined,
providing clear feedback instead of silently ignoring the --remote flag.

Fixes #2722

Signed-off-by: majiayu000 <1835304752@qq.com>
---
 pkg/cmd/repo/fork/fork.go      | 4 ++++
 pkg/cmd/repo/fork/fork_test.go | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go
index b620291d6..3ebb02413 100644
--- a/pkg/cmd/repo/fork/fork.go
+++ b/pkg/cmd/repo/fork/fork.go
@@ -113,6 +113,10 @@ func NewCmdFork(f *cmdutil.Factory, runF func(*ForkOptions) error) *cobra.Comman
 				opts.Rename = true // Any existing 'origin' will be renamed to upstream
 			}
 
+			if opts.Repository != "" && cmd.Flags().Changed("remote") {
+				return cmdutil.FlagErrorf("the `--remote` flag is unsupported when a repository argument is provided")
+			}
+
 			if promptOk {
 				// We can prompt for these if they were not specified.
 				opts.PromptClone = !cmd.Flags().Changed("clone")
diff --git a/pkg/cmd/repo/fork/fork_test.go b/pkg/cmd/repo/fork/fork_test.go
index 1f0b9cef1..edf5f2763 100644
--- a/pkg/cmd/repo/fork/fork_test.go
+++ b/pkg/cmd/repo/fork/fork_test.go
@@ -144,6 +144,12 @@ func TestNewCmdFork(t *testing.T) {
 				Rename:     false,
 			},
 		},
+		{
+			name:    "remote with repo argument",
+			cli:     "foo/bar --remote",
+			wantErr: true,
+			errMsg:  "the `--remote` flag is unsupported when a repository argument is provided",
+		},
 	}
 
 	for _, tt := range tests {