Skip to content

fork: Allow forking from remotes other than "origin" #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmeneg merged 1 commit into from
Jan 22, 2021
Merged

fork: Allow forking from remotes other than "origin" #564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions cmd/fork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var (

// forkCmd represents the fork command
var forkCmd = &cobra.Command{
Use: "fork [upstream-to-fork]",
Use: "fork [remote|upstream-to-fork]",
Short: "Fork a remote repository on GitLab and add as remote",
Long: ``,
Args: cobra.MaximumNArgs(1),
Expand All @@ -47,15 +47,33 @@ var forkCmd = &cobra.Command{
}
}

remote, project := "", ""
if len(args) == 1 {
forkToUpstream(args[0])
if ok, _ := git.IsRemote(args[0]); ok {
remote = args[0]
} else {
project = args[0]
}
}

if project != "" {
forkToUpstream(project)
return
}
forkFromOrigin()

if remote == "" {
remote = "origin"
}

project, err := git.PathWithNameSpace(remote)
if err != nil {
log.Fatal(err)
}
forkFromOrigin(project)
},
}

func forkFromOrigin() {
func forkFromOrigin(project string) {
// Check for custom target namespace
remote := lab.User()
if targetData.group != "" {
Expand All @@ -82,11 +100,6 @@ func forkFromOrigin() {
return
}

project, err := git.PathWithNameSpace("origin")
if err != nil {
log.Fatal(err)
}

forkRemoteURL, err := lab.Fork(project, forkOpts, useHTTP, waitFork)
if err != nil {
if err.Error() == "not finished" {
Expand Down