From 568f4e4ee00a2ad6cce26bc87fea19bf9d938733 Mon Sep 17 00:00:00 2001 From: camille folch Date: Tue, 8 Jun 2021 20:26:22 -0300 Subject: [PATCH] Minor refactoring for readability in NewCmdFork's runE --- pkg/cmd/repo/fork/fork.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go index 36deda843..a83000e0a 100644 --- a/pkg/cmd/repo/fork/fork.go +++ b/pkg/cmd/repo/fork/fork.go @@ -89,18 +89,14 @@ Additional 'git clone' flags can be passed in by listing them after '--'.`, if opts.RemoteName == "" { return &cmdutil.FlagError{Err: errors.New("--remote-name cannot be blank")} + } else if !cmd.Flags().Changed("remote-name") { + opts.Rename = true // Any existing 'origin' will be renamed to upstream } - if promptOk && !cmd.Flags().Changed("clone") { - opts.PromptClone = true - } - - if promptOk && !cmd.Flags().Changed("remote") { - opts.PromptRemote = true - } - - if !cmd.Flags().Changed("remote-name") { - opts.Rename = true + if promptOk { + // We can prompt for these if they were not specified. + opts.PromptClone = !cmd.Flags().Changed("clone") + opts.PromptRemote = !cmd.Flags().Changed("remote") } if runF != nil {