repo fork: check that --org is not the empty string

camillesf · camillesf · commit 54b86c70937f · 2021-06-11T23:28:41.000-03:00
As it is already being done for --remote-name, except in this case
the default is the empty string.
diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go
@@ -83,6 +83,10 @@ Additional 'git clone' flags can be passed in by listing them after '--'.`,
 				opts.GitArgs = args[1:]
 			}
 
+			if cmd.Flags().Changed("org") && opts.Organization == "" {
+				return &cmdutil.FlagError{Err: errors.New("--org cannot be blank")}
+			}
+
 			if opts.RemoteName == "" {
 				return &cmdutil.FlagError{Err: errors.New("--remote-name cannot be blank")}
 			}
diff --git a/pkg/cmd/repo/fork/fork_test.go b/pkg/cmd/repo/fork/fork_test.go
@@ -120,6 +120,12 @@ func TestNewCmdFork(t *testing.T) {
 				Organization: "batmanshome",
 			},
 		},
+		{
+			name:    "empty org",
+			cli:     " --org=''",
+			wantErr: true,
+			errMsg:  "--org cannot be blank",
+		},
 		{
 			name:    "git flags in wrong place",
 			cli:     "--depth 1 OWNER/REPO",

Original file line number	Diff line number	Diff line change
@@ -83,6 +83,10 @@ Additional 'git clone' flags can be passed in by listing them after '--'.`,
`83`	`83`	`opts.GitArgs = args[1:]`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ if cmd.Flags().Changed("org") && opts.Organization == "" {`
	`87`	`+ return &cmdutil.FlagError{Err: errors.New("--org cannot be blank")}`
	`88`	`+ }`
	`89`	`+`
`86`	`90`	`if opts.RemoteName == "" {`
`87`	`91`	`return &cmdutil.FlagError{Err: errors.New("--remote-name cannot be blank")}`
`88`	`92`	`}`