STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restore renaming behavior for nontty case

Browse source
This commit is contained in:
vilmibm 2021-01-22 15:52:23 -08:00
parent 6e2c1b33b0
commit 1fa3047b59
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/cmd/repo/fork/fork.go
View file

@ -12,6 +12,7 @@ import (
"github.com/cli/cli/git"
"github.com/cli/cli/internal/config"
"github.com/cli/cli/internal/ghrepo"
"github.com/cli/cli/internal/run"
"github.com/cli/cli/pkg/cmdutil"
"github.com/cli/cli/pkg/iostreams"
"github.com/cli/cli/pkg/prompt"
@ -234,8 +235,21 @@ func forkRun(opts *ForkOptions) error {
if err != nil {
return err
}
if _, err := remotes.FindByName(remoteName); err == nil {
return fmt.Errorf("a remote called '%s' already exists. You can rerun this command with --remote-name to specify a different remote name.", remoteName)
if connectedToTerminal {
return fmt.Errorf("a remote called '%s' already exists. You can rerun this command with --remote-name to specify a different remote name.", remoteName)
} else {
renameTarget := "upstream"
renameCmd, err := git.GitCommand("remote", "rename", remoteName, renameTarget)
if err != nil {
return err
}
err = run.PrepareCmd(renameCmd).Run()
if err != nil {
return err
}
}
}
forkedRepoCloneURL := ghrepo.FormatRemoteURL(forkedRepo, protocol)