gh: Fork compatibility fix

commands/browse.go

@@ -67,7 +67,7 @@ func browse(command *Command, args *Args) {
 		subpage = args.RemoveParam(0)
 	}
 
-	localRepo := github.LocalRepo()
+	localRepo, _ := github.LocalRepo()
 	if dest != "" {
 		project = github.NewProject("", dest, "")
 		branch = localRepo.MasterBranch()

commands/checkout.go

@@ -84,7 +84,9 @@ func transformCheckoutArgs(args *Args) error {
 		newBranchName = fmt.Sprintf("%s-%s", user, branch)
 	}
 
-	repo := github.LocalRepo()
+	repo, err := github.LocalRepo()
+	utils.Check(err)
+
 	_, err = repo.RemoteByName(user)
 	if err == nil {
 		args.Before("git", "remote", "set-branches", "--add", user, branch)

commands/cherry_pick.go

@@ -1,9 +1,10 @@
 package commands
 
 import (
+	"regexp"
+
 	"github.com/github/hub/github"
 	"github.com/github/hub/utils"
-	"regexp"
 )
 
 var cmdCherryPick = &Command{
@@ -72,7 +73,10 @@ func parseCherryPickProjectAndSha(ref string) (project *github.Project, sha stri
 	if ownerWithShaRegexp.MatchString(ref) {
 		matches := ownerWithShaRegexp.FindStringSubmatch(ref)
 		sha = matches[2]
-		project, err := github.LocalRepo().CurrentProject()
+		localRepo, err := github.LocalRepo()
+		utils.Check(err)
+
+		project, err := localRepo.CurrentProject()
 		utils.Check(err)
 		project.Owner = matches[1]
 	}

commands/ci_status.go

@@ -2,10 +2,11 @@ package commands
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/github/hub/git"
 	"github.com/github/hub/github"
 	"github.com/github/hub/utils"
-	"os"
 )
 
 var cmdCiStatus = &Command{
@@ -51,7 +52,9 @@ func ciStatus(cmd *Command, args *Args) {
 		ref = args.RemoveParam(0)
 	}
 
-	localRepo := github.LocalRepo()
+	localRepo, err := github.LocalRepo()
+	utils.Check(err)
+
 	project, err := localRepo.MainProject()
 	utils.Check(err)
 

commands/compare.go

@@ -44,12 +44,13 @@ func init() {
   > open https://github.com/other-user/REPO/compare/patch
 */
 func compare(command *Command, args *Args) {
-	localRepo := github.LocalRepo()
+	localRepo, err := github.LocalRepo()
+	utils.Check(err)
+
 	var (
 		branch  *github.Branch
 		project *github.Project
 		r       string
-		err     error
 	)
 
 	branch, project, err = localRepo.RemoteBranchAndProject("")

commands/fetch.go

@@ -1,10 +1,11 @@
 package commands
 
 import (
-	"github.com/github/hub/github"
-	"github.com/github/hub/utils"
 	"regexp"
 	"strings"
+
+	"github.com/github/hub/github"
+	"github.com/github/hub/utils"
 )
 
 var cmdFetch = &Command{
@@ -45,7 +46,9 @@ func fetch(command *Command, args *Args) {
 
 func tranformFetchArgs(args *Args) error {
 	names := parseRemoteNames(args)
-	localRepo := github.LocalRepo()
+
+	localRepo, err := github.LocalRepo()
+	utils.Check(err)
 
 	projects := make(map[*github.Project]bool)
 	ownerRegexp := regexp.MustCompile(OwnerRe)

commands/fork.go

@@ -2,11 +2,10 @@ package commands
 
 import (
 	"fmt"
-	"os"
-	"reflect"
-
 	"github.com/github/hub/github"
 	"github.com/github/hub/utils"
+	"os"
+	"reflect"
 )
 
 var cmdFork = &Command{
@@ -35,10 +34,13 @@ func init() {
   [ repo forked on GitHub ]
 */
 func fork(cmd *Command, args *Args) {
-	localRepo := github.LocalRepo()
+	localRepo, err := github.LocalRepo()
+	utils.Check(err)
 
 	project, err := localRepo.MainProject()
-	utils.Check(err)
+	if err != nil {
+		utils.Check(fmt.Errorf("Error: repository under 'origin' remote is not a GitHub project"))
+	}
 
 	configs := github.CurrentConfigs()
 	host, err := configs.PromptForHost(project.Host)
@@ -47,7 +49,6 @@ func fork(cmd *Command, args *Args) {
 	}
 
 	forkProject := github.NewProject(host.User, project.Name, project.Host)
-
 	client := github.NewClient(project.Host)
 	existingRepo, err := client.Repository(forkProject)
 	if err == nil {
@@ -70,8 +71,11 @@ func fork(cmd *Command, args *Args) {
 	if flagForkNoRemote {
 		os.Exit(0)
 	} else {
-		u := forkProject.GitURL("", "", true)
-		args.Replace("git", "remote", "add", "-f", forkProject.Owner, u)
+		originRemote, _ := localRepo.OriginRemote()
+		originURL := originRemote.URL.String()
+		url := forkProject.GitURL("", "", true)
+		args.Replace("git", "remote", "add", "-f", forkProject.Owner, originURL)
+		args.After("git", "remote", "set-url", forkProject.Owner, url)
 		args.After("echo", fmt.Sprintf("new remote: %s", forkProject.Owner))
 	}
 }

commands/pull_request.go

@@ -76,7 +76,8 @@ func init() {
   [ create pull request with title & body from FILE ]
 */
 func pullRequest(cmd *Command, args *Args) {
-	localRepo := github.LocalRepo()
+	localRepo, err := github.LocalRepo()
+	utils.Check(err)
 
 	currentBranch, err := localRepo.CurrentBranch()
 	utils.Check(err)

commands/push.go

@@ -1,9 +1,10 @@
 package commands
 
 import (
+	"strings"
+
 	"github.com/github/hub/github"
 	"github.com/github/hub/utils"
-	"strings"
 )
 
 var cmdPush = &Command{
@@ -44,9 +45,12 @@ func transformPushArgs(args *Args) {
 	args.ReplaceParam(0, remotes[0])
 
 	if len(refs) == 0 {
-		localRepo := github.LocalRepo()
+		localRepo, err := github.LocalRepo()
+		utils.Check(err)
+
 		head, err := localRepo.CurrentBranch()
 		utils.Check(err)
+
 		refs = []string{head.ShortName()}
 		args.AppendParams(refs...)
 	}