From 9175fc06d40d8cea9a03a60750e59828ecb36267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 25 Feb 2020 17:58:04 +0100
Subject: [PATCH 01/41] Add preliminary `repo create` command

---
 command/repo.go | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/command/repo.go b/command/repo.go
index 484ef609c..7b8dd2728 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -3,6 +3,7 @@ package command
 import (
 	"fmt"
 	"os"
+	"path"
 	"strings"
 
 	"github.com/cli/cli/git"
@@ -14,6 +15,8 @@ import (
 func init() {
 	RootCmd.AddCommand(repoCmd)
 	repoCmd.AddCommand(repoCloneCmd)
+	repoCmd.AddCommand(repoCreateCmd)
+	repoCreateCmd.Flags().Bool("public", false, "Make the new repository public")
 	repoCmd.AddCommand(repoViewCmd)
 }
 
@@ -37,6 +40,13 @@ To pass 'git clone' options, separate them with '--'.`,
 	RunE: repoClone,
 }
 
+var repoCreateCmd = &cobra.Command{
+	Use:   "create [<name>]",
+	Short: "Create a new repository",
+	Long:  `Create a new GitHub repository.`,
+	RunE:  repoCreate,
+}
+
 var repoViewCmd = &cobra.Command{
 	Use:   "view [<repo>]",
 	Short: "View a repository in the browser",
@@ -63,6 +73,61 @@ func repoClone(cmd *cobra.Command, args []string) error {
 	return utils.PrepareCmd(cloneCmd).Run()
 }
 
+func repoCreate(cmd *cobra.Command, args []string) error {
+	var name string
+	if len(args) > 0 {
+		name = args[0]
+	} else {
+		dir, err := git.ToplevelDir()
+		if err != nil {
+			return err
+		}
+		name = path.Base(dir)
+	}
+
+	visibility := "PRIVATE"
+	if isPublic, err := cmd.Flags().GetBool("public"); err == nil && isPublic {
+		visibility = "PUBLIC"
+	}
+
+	ctx := contextForCommand(cmd)
+	client, err := apiClientForContext(ctx)
+	if err != nil {
+		return err
+	}
+
+	variables := map[string]interface{}{
+		"input": map[string]interface{}{
+			"name":       name,
+			"visibility": visibility,
+		},
+	}
+
+	var response struct {
+		CreateRepository struct {
+			Repository struct {
+				URL string
+			}
+		}
+	}
+
+	err = client.GraphQL(`
+	mutation($input: CreateRepositoryInput!) {
+		createRepository(input: $input) {
+			repository {
+				url
+			}
+		}
+	}
+	`, variables, &response)
+	if err != nil {
+		return err
+	}
+
+	cmd.Println(response.CreateRepository.Repository.URL)
+	return nil
+}
+
 func repoView(cmd *cobra.Command, args []string) error {
 	ctx := contextForCommand(cmd)
 

From 6eaab2562fe2b9ce27daad250cccf3b3667c28c1 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 24 Feb 2020 14:23:34 -0600
Subject: [PATCH 02/41] add repo fork command

---
 api/queries_repo.go |  59 +++++++++++++---
 command/repo.go     | 164 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 212 insertions(+), 11 deletions(-)

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 9d0c4f00d..16060abc5 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -12,9 +12,10 @@ import (
 
 // Repository contains information about a GitHub repo
 type Repository struct {
-	ID    string
-	Name  string
-	Owner RepositoryOwner
+	ID       string
+	Name     string
+	CloneURL string
+	Owner    RepositoryOwner
 
 	IsPrivate        bool
 	HasIssuesEnabled bool
@@ -59,6 +60,46 @@ func (r Repository) ViewerCanPush() bool {
 	}
 }
 
+func RepoExistsOnGitHub(client *Client, repo ghrepo.Interface) (bool, error) {
+	query := `
+	query($owner: String!, $name: String!) {
+		repository(owner: $owner, name: $name) {
+			id
+		}
+	}
+	`
+	variables := map[string]interface{}{
+		"owner": repo.RepoOwner(),
+		"name":  repo.RepoName(),
+	}
+
+	result := struct {
+		Repository Repository
+	}{}
+	err := client.GraphQL(query, variables, &result)
+
+	if err == nil {
+		// we found it.
+		return true, nil
+	}
+
+	// we didn't find it, but need to determine if we hit an error or it just doesn't exist.
+	graphqlError, isGraphQLError := err.(*GraphQLErrorResponse)
+	if isGraphQLError {
+		tolerated := true
+		for _, ge := range graphqlError.Errors {
+			if ge.Type != "NOT_FOUND" {
+				tolerated = false
+			}
+		}
+		if tolerated {
+			err = nil
+		}
+	}
+
+	return false, err
+}
+
 // GitHubRepo looks up the node ID of a named repository
 func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	query := `
@@ -190,9 +231,10 @@ func RepoNetwork(client *Client, repos []ghrepo.Interface) (RepoNetworkResult, e
 
 // repositoryV3 is the repository result from GitHub API v3
 type repositoryV3 struct {
-	NodeID string
-	Name   string
-	Owner  struct {
+	NodeID   string
+	Name     string
+	CloneURL string `json:"clone_url"`
+	Owner    struct {
 		Login string
 	}
 }
@@ -208,8 +250,9 @@ func ForkRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	}
 
 	return &Repository{
-		ID:   result.NodeID,
-		Name: result.Name,
+		ID:       result.NodeID,
+		Name:     result.Name,
+		CloneURL: result.CloneURL,
 		Owner: RepositoryOwner{
 			Login: result.Owner.Login,
 		},
diff --git a/command/repo.go b/command/repo.go
index 484ef609c..61cc2fc8a 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -2,12 +2,16 @@ package command
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"strings"
 
+	"github.com/cli/cli/api"
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/internal/ghrepo"
 	"github.com/cli/cli/utils"
+
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/spf13/cobra"
 )
 
@@ -15,6 +19,10 @@ func init() {
 	RootCmd.AddCommand(repoCmd)
 	repoCmd.AddCommand(repoCloneCmd)
 	repoCmd.AddCommand(repoViewCmd)
+	repoCmd.AddCommand(repoForkCmd)
+
+	repoForkCmd.Flags().BoolP("yes", "y", false, "Run non-interactively, saying yes to prompts")
+	repoForkCmd.Flags().BoolP("no", "n", false, "Run non-interactively, saying no to prompts")
 }
 
 var repoCmd = &cobra.Command{
@@ -37,9 +45,18 @@ To pass 'git clone' options, separate them with '--'.`,
 	RunE: repoClone,
 }
 
+var repoForkCmd = &cobra.Command{
+	Use:   "fork [<repository>]",
+	Short: "Create a fork of a repository.",
+	Long: `Create a fork of a repository.
+
+With no argument, creates a fork of the current repository. Otherwise, forks the specified repository.`,
+	RunE: repoFork,
+}
+
 var repoViewCmd = &cobra.Command{
-	Use:   "view [<repo>]",
-	Short: "View a repository in the browser",
+	Use:   "view [<repository>]",
+	Short: "View a repository in the browser.",
 	Long: `View a GitHub repository in the browser.
 
 With no argument, the repository for the current directory is opened.`,
@@ -63,6 +80,147 @@ func repoClone(cmd *cobra.Command, args []string) error {
 	return utils.PrepareCmd(cloneCmd).Run()
 }
 
+func isURL(arg string) bool {
+	return strings.HasPrefix(arg, "http:/") || strings.HasPrefix(arg, "https:/")
+}
+
+func repoFork(cmd *cobra.Command, args []string) error {
+	ctx := contextForCommand(cmd)
+
+	forceYes, err := cmd.Flags().GetBool("yes")
+	if err != nil {
+		return err
+	}
+	forceNo, err := cmd.Flags().GetBool("no")
+	if err != nil {
+		return err
+	}
+
+	apiClient, err := apiClientForContext(ctx)
+	if err != nil {
+		return fmt.Errorf("unable to create client: %w", err)
+	}
+
+	var toFork ghrepo.Interface
+	inParent := false // whether or not we're forking the repo we're currently "in"
+	if len(args) == 0 {
+		baseRepo, err := determineBaseRepo(cmd, ctx)
+		if err != nil {
+			return fmt.Errorf("unable to determine base repository: %w", err)
+		}
+		inParent = true
+		toFork = baseRepo
+	} else {
+		repoArg := args[0]
+
+		if isURL(repoArg) {
+			parsedURL, err := url.Parse(repoArg)
+			if err != nil {
+				return fmt.Errorf("did not understand argument: %w", err)
+			}
+
+			toFork, err = ghrepo.FromURL(parsedURL)
+			if err != nil {
+				return fmt.Errorf("did not understand argument: %w", err)
+			}
+
+		} else {
+			toFork = ghrepo.FromFullName(repoArg)
+			if toFork.RepoName() == "" || toFork.RepoOwner() == "" {
+				return fmt.Errorf("could not parse owner or repo name from %s", repoArg)
+			}
+		}
+	}
+
+	out := colorableOut(cmd)
+	fmt.Fprintf(out, "Forking %s...\n", utils.Cyan(ghrepo.FullName(toFork)))
+
+	authLogin, err := ctx.AuthLogin()
+	if err != nil {
+		return fmt.Errorf("could not determine current username: %w", err)
+	}
+
+	possibleFork := ghrepo.New(authLogin, toFork.RepoName())
+	exists, err := api.RepoExistsOnGitHub(apiClient, possibleFork)
+	if err != nil {
+		return fmt.Errorf("problem with API request: %w", err)
+	}
+
+	if exists {
+		return fmt.Errorf("%s %s", utils.Cyan(ghrepo.FullName(possibleFork)), utils.Red("already exists!"))
+	}
+
+	forkedRepo, err := api.ForkRepo(apiClient, toFork)
+	if err != nil {
+		return fmt.Errorf("failed to fork: %w", err)
+	}
+
+	fmt.Fprintf(out, "%s %s %s!\n",
+		utils.Cyan(ghrepo.FullName(toFork)),
+		utils.Green("successfully forked to"),
+		utils.Cyan(ghrepo.FullName(forkedRepo)))
+
+	if forceNo {
+		return nil
+	}
+
+	if inParent {
+		if !forceYes {
+			remoteDesired := forceYes
+			if !forceYes {
+				prompt := &survey.Confirm{
+					Message: "Would you like to add a remote for the new fork?",
+				}
+				err = survey.AskOne(prompt, &remoteDesired)
+				if err != nil {
+					return fmt.Errorf("failed to prompt: %w", err)
+				}
+			}
+			if remoteDesired {
+				_, err := git.AddRemote("fork", forkedRepo.CloneURL, "")
+				if err != nil {
+					return fmt.Errorf("failed to add remote: %w", err)
+				}
+
+				fetchCmd := git.GitCommand("fetch", "fork")
+				fetchCmd.Stdin = os.Stdin
+				fetchCmd.Stdout = os.Stdout
+				fetchCmd.Stderr = os.Stderr
+				err = utils.PrepareCmd(fetchCmd).Run()
+				if err != nil {
+					return fmt.Errorf("failed to fetch new remote: %w", err)
+				}
+
+				fmt.Fprintf(out, "%s %s\n", utils.Green("remote added at "), utils.Cyan("fork"))
+			}
+		}
+	} else {
+		cloneDesired := forceYes
+		if !forceYes {
+			prompt := &survey.Confirm{
+				Message: "Would you like to clone the new fork?",
+			}
+			err = survey.AskOne(prompt, &cloneDesired)
+			if err != nil {
+				return fmt.Errorf("failed to prompt: %w", err)
+			}
+
+		}
+		if cloneDesired {
+			cloneCmd := git.GitCommand("clone", forkedRepo.CloneURL)
+			cloneCmd.Stdin = os.Stdin
+			cloneCmd.Stdout = os.Stdout
+			cloneCmd.Stderr = os.Stderr
+			err = utils.PrepareCmd(cloneCmd).Run()
+			if err != nil {
+				return fmt.Errorf("failed to clone fork: %w", err)
+			}
+		}
+	}
+
+	return nil
+}
+
 func repoView(cmd *cobra.Command, args []string) error {
 	ctx := contextForCommand(cmd)
 
@@ -75,7 +233,7 @@ func repoView(cmd *cobra.Command, args []string) error {
 		openURL = fmt.Sprintf("https://github.com/%s", ghrepo.FullName(baseRepo))
 	} else {
 		repoArg := args[0]
-		if strings.HasPrefix(repoArg, "http:/") || strings.HasPrefix(repoArg, "https:/") {
+		if isURL(repoArg) {
 			openURL = repoArg
 		} else {
 			openURL = fmt.Sprintf("https://github.com/%s", repoArg)

From 99ac0cb87df6e2b8e4d7db6bc2e49be42f9b6eb3 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 25 Feb 2020 14:57:27 -0600
Subject: [PATCH 03/41] add StubWithFixture helper

---
 api/fake_http.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/api/fake_http.go b/api/fake_http.go
index 32b7d56eb..3933178a4 100644
--- a/api/fake_http.go
+++ b/api/fake_http.go
@@ -6,6 +6,8 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"os"
+	"path"
 )
 
 // FakeHTTP provides a mechanism by which to stub HTTP responses through
@@ -37,6 +39,13 @@ func (f *FakeHTTP) RoundTrip(req *http.Request) (*http.Response, error) {
 	return resp, nil
 }
 
+func (f *FakeHTTP) StubWithFixture(status int, fixtureFileName string) func() {
+	fixturePath := path.Join("../test/fixtures/", fixtureFileName)
+	fixtureFile, _ := os.Open(fixturePath)
+	f.StubResponse(status, fixtureFile)
+	return func() { fixtureFile.Close() }
+}
+
 func (f *FakeHTTP) StubRepoResponse(owner, repo string) {
 	body := bytes.NewBufferString(fmt.Sprintf(`
 		{ "data": { "repo_000": {

From 4f25d06c1e2818c71841b9cabfdf5f560496e041 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 25 Feb 2020 14:57:36 -0600
Subject: [PATCH 04/41] add repo fork tests

---
 command/repo.go                 |  58 +++---
 command/repo_test.go            | 334 ++++++++++++++++++++++++++++++++
 test/fixtures/forkResult.json   |   8 +
 test/fixtures/repo.json         |   7 +
 test/fixtures/repoNotFound.json |  20 ++
 5 files changed, 397 insertions(+), 30 deletions(-)
 create mode 100644 test/fixtures/forkResult.json
 create mode 100644 test/fixtures/repo.json
 create mode 100644 test/fixtures/repoNotFound.json

diff --git a/command/repo.go b/command/repo.go
index 61cc2fc8a..55323c533 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -165,46 +165,37 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	}
 
 	if inParent {
+		remoteDesired := forceYes
 		if !forceYes {
-			remoteDesired := forceYes
-			if !forceYes {
-				prompt := &survey.Confirm{
-					Message: "Would you like to add a remote for the new fork?",
-				}
-				err = survey.AskOne(prompt, &remoteDesired)
-				if err != nil {
-					return fmt.Errorf("failed to prompt: %w", err)
-				}
+			err = Confirm("Would you like to add a remote for the new fork?", &remoteDesired)
+			if err != nil {
+				return fmt.Errorf("failed to prompt: %w", err)
 			}
-			if remoteDesired {
-				_, err := git.AddRemote("fork", forkedRepo.CloneURL, "")
-				if err != nil {
-					return fmt.Errorf("failed to add remote: %w", err)
-				}
-
-				fetchCmd := git.GitCommand("fetch", "fork")
-				fetchCmd.Stdin = os.Stdin
-				fetchCmd.Stdout = os.Stdout
-				fetchCmd.Stderr = os.Stderr
-				err = utils.PrepareCmd(fetchCmd).Run()
-				if err != nil {
-					return fmt.Errorf("failed to fetch new remote: %w", err)
-				}
-
-				fmt.Fprintf(out, "%s %s\n", utils.Green("remote added at "), utils.Cyan("fork"))
+		}
+		if remoteDesired {
+			_, err := git.AddRemote("fork", forkedRepo.CloneURL, "")
+			if err != nil {
+				return fmt.Errorf("failed to add remote: %w", err)
 			}
+
+			fetchCmd := git.GitCommand("fetch", "fork")
+			fetchCmd.Stdin = os.Stdin
+			fetchCmd.Stdout = os.Stdout
+			fetchCmd.Stderr = os.Stderr
+			err = utils.PrepareCmd(fetchCmd).Run()
+			if err != nil {
+				return fmt.Errorf("failed to fetch new remote: %w", err)
+			}
+
+			fmt.Fprintf(out, "%s %s\n", utils.Green("remote added at"), utils.Cyan("fork"))
 		}
 	} else {
 		cloneDesired := forceYes
 		if !forceYes {
-			prompt := &survey.Confirm{
-				Message: "Would you like to clone the new fork?",
-			}
-			err = survey.AskOne(prompt, &cloneDesired)
+			err = Confirm("Would you like to clone the new fork?", &cloneDesired)
 			if err != nil {
 				return fmt.Errorf("failed to prompt: %w", err)
 			}
-
 		}
 		if cloneDesired {
 			cloneCmd := git.GitCommand("clone", forkedRepo.CloneURL)
@@ -221,6 +212,13 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+var Confirm = func(prompt string, result *bool) error {
+	p := &survey.Confirm{
+		Message: prompt,
+	}
+	return survey.AskOne(p, result)
+}
+
 func repoView(cmd *cobra.Command, args []string) error {
 	ctx := contextForCommand(cmd)
 
diff --git a/command/repo_test.go b/command/repo_test.go
index 588ae3520..e44ae6820 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -2,6 +2,7 @@ package command
 
 import (
 	"os/exec"
+	"regexp"
 	"strings"
 	"testing"
 
@@ -9,6 +10,339 @@ import (
 	"github.com/cli/cli/utils"
 )
 
+func TestRepoFork_already_forked(t *testing.T) {
+	initContext = func() context.Context {
+		ctx := context.NewBlank()
+		ctx.SetBaseRepo("REPO")
+		ctx.SetBranch("master")
+		ctx.SetAuthLogin("someone")
+		ctx.SetRemotes(map[string]string{
+			"origin": "OWNER/REPO",
+		})
+		return ctx
+	}
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+	defer http.StubWithFixture(200, "repo.json")()
+
+	_, err := RunCommand(repoForkCmd, "repo fork -n")
+	if err == nil {
+		t.Errorf("expected repo fork to error")
+	}
+	if err.Error() != "someone/REPO already exists!" {
+		t.Errorf("unexpected error: %v", err)
+	}
+}
+
+func TestRepoFork_in_parent(t *testing.T) {
+	initBlankContext("OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	output, err := RunCommand(repoForkCmd, "repo fork -n")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	eq(t, output.Stderr(), "")
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`Forking OWNER/REPO`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_outside(t *testing.T) {
+	tests := []struct {
+		name string
+		args string
+	}{
+		{
+			name: "url arg",
+			args: "repo fork -n http://github.com/OWNER/REPO.git",
+		},
+		{
+			name: "full name arg",
+			args: "repo fork -n OWNER/REPO",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			http := initFakeHTTP()
+			defer http.StubWithFixture(200, "repoNotFound.json")()
+			defer http.StubWithFixture(200, "forkResult.json")()
+
+			output, err := RunCommand(repoForkCmd, tt.args)
+			if err != nil {
+				t.Errorf("error running command `repo fork`: %v", err)
+			}
+
+			eq(t, output.Stderr(), "")
+
+			expectedLines := []*regexp.Regexp{
+				regexp.MustCompile(`successfully forked to someone/REPO`),
+				regexp.MustCompile(`Forking OWNER/REPO`),
+			}
+			for _, r := range expectedLines {
+				if !r.MatchString(output.String()) {
+					t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+					return
+				}
+			}
+		})
+	}
+}
+
+func TestRepoFork_in_parent_yes(t *testing.T) {
+	initBlankContext("OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	var seenCmds []*exec.Cmd
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmds = append(seenCmds, cmd)
+		return &outputStub{}
+	})()
+
+	output, err := RunCommand(repoForkCmd, "repo fork -y")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	expectedCmds := []string{
+		"git remote add -f fork https://github.com/someone/repo.git",
+		"git fetch fork",
+	}
+
+	for x, cmd := range seenCmds {
+		eq(t, strings.Join(cmd.Args, " "), expectedCmds[x])
+	}
+
+	eq(t, output.Stderr(), "")
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`remote added at fork`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_outside_yes(t *testing.T) {
+	http := initFakeHTTP()
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	var seenCmd *exec.Cmd
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmd = cmd
+		return &outputStub{}
+	})()
+
+	output, err := RunCommand(repoForkCmd, "repo fork -y OWNER/REPO")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	eq(t, output.Stderr(), "")
+
+	eq(t, strings.Join(seenCmd.Args, " "), "git clone https://github.com/someone/repo.git")
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`Forking OWNER/REPO`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_outside_survey_yes(t *testing.T) {
+	http := initFakeHTTP()
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	var seenCmd *exec.Cmd
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmd = cmd
+		return &outputStub{}
+	})()
+
+	oldConfirm := Confirm
+	Confirm = func(_ string, result *bool) error {
+		*result = true
+		return nil
+	}
+	defer func() { Confirm = oldConfirm }()
+
+	output, err := RunCommand(repoForkCmd, "repo fork OWNER/REPO")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	eq(t, output.Stderr(), "")
+
+	eq(t, strings.Join(seenCmd.Args, " "), "git clone https://github.com/someone/repo.git")
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`Forking OWNER/REPO`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_outside_survey_no(t *testing.T) {
+	http := initFakeHTTP()
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	cmdRun := false
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		cmdRun = true
+		return &outputStub{}
+	})()
+
+	oldConfirm := Confirm
+	Confirm = func(_ string, result *bool) error {
+		*result = false
+		return nil
+	}
+	defer func() { Confirm = oldConfirm }()
+
+	output, err := RunCommand(repoForkCmd, "repo fork OWNER/REPO")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	eq(t, output.Stderr(), "")
+
+	eq(t, cmdRun, false)
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`Forking OWNER/REPO`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_in_parent_survey_yes(t *testing.T) {
+	initBlankContext("OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	var seenCmds []*exec.Cmd
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmds = append(seenCmds, cmd)
+		return &outputStub{}
+	})()
+
+	oldConfirm := Confirm
+	Confirm = func(_ string, result *bool) error {
+		*result = true
+		return nil
+	}
+	defer func() { Confirm = oldConfirm }()
+
+	output, err := RunCommand(repoForkCmd, "repo fork")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	expectedCmds := []string{
+		"git remote add -f fork https://github.com/someone/repo.git",
+		"git fetch fork",
+	}
+
+	for x, cmd := range seenCmds {
+		eq(t, strings.Join(cmd.Args, " "), expectedCmds[x])
+	}
+
+	eq(t, output.Stderr(), "")
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`remote added at fork`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
+func TestRepoFork_in_parent_survey_no(t *testing.T) {
+	initBlankContext("OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+	defer http.StubWithFixture(200, "repoNotFound.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
+
+	cmdRun := false
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		cmdRun = true
+		return &outputStub{}
+	})()
+
+	oldConfirm := Confirm
+	Confirm = func(_ string, result *bool) error {
+		*result = false
+		return nil
+	}
+	defer func() { Confirm = oldConfirm }()
+
+	output, err := RunCommand(repoForkCmd, "repo fork")
+	if err != nil {
+		t.Errorf("error running command `repo fork`: %v", err)
+	}
+
+	eq(t, output.Stderr(), "")
+
+	eq(t, cmdRun, false)
+
+	expectedLines := []*regexp.Regexp{
+		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`successfully forked to someone/REPO`),
+	}
+	for _, r := range expectedLines {
+		if !r.MatchString(output.String()) {
+			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+			return
+		}
+	}
+}
+
 func TestRepoClone(t *testing.T) {
 	tests := []struct {
 		name string
diff --git a/test/fixtures/forkResult.json b/test/fixtures/forkResult.json
new file mode 100644
index 000000000..3b6ab671b
--- /dev/null
+++ b/test/fixtures/forkResult.json
@@ -0,0 +1,8 @@
+{
+  "node_id": "123",
+  "name": "REPO",
+  "clone_url": "https://github.com/someone/repo.git",
+  "owner": {
+    "login": "someone"
+  }
+}
diff --git a/test/fixtures/repo.json b/test/fixtures/repo.json
new file mode 100644
index 000000000..893c1f2c2
--- /dev/null
+++ b/test/fixtures/repo.json
@@ -0,0 +1,7 @@
+{
+  "data": {
+    "repository": {
+      "id": "MDEwOlJlcG9zaXRvcnkyMTI2MTMwNDk="
+    }
+  }
+}
diff --git a/test/fixtures/repoNotFound.json b/test/fixtures/repoNotFound.json
new file mode 100644
index 000000000..ac6ed2adc
--- /dev/null
+++ b/test/fixtures/repoNotFound.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "repository": null
+  },
+  "errors": [
+    {
+      "type": "NOT_FOUND",
+      "path": [
+        "repository"
+      ],
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "message": "Could not resolve to a Repository with the name 'REPO'."
+    }
+  ]
+}

From ded870714f0c4ef3364926863f82ff980b135373 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 25 Feb 2020 15:44:29 -0600
Subject: [PATCH 05/41] add SetAuthLogin helper to blank context

---
 context/blank_context.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/context/blank_context.go b/context/blank_context.go
index 871d91d21..ec00b2220 100644
--- a/context/blank_context.go
+++ b/context/blank_context.go
@@ -30,6 +30,10 @@ func (c *blankContext) SetAuthToken(t string) {
 	c.authToken = t
 }
 
+func (c *blankContext) SetAuthLogin(login string) {
+	c.authLogin = login
+}
+
 func (c *blankContext) AuthLogin() (string, error) {
 	return c.authLogin, nil
 }

From 8a3337ca66d819e723f42fddadc87f3dc9b0b8e9 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 25 Feb 2020 16:24:36 -0600
Subject: [PATCH 06/41] switch default to Y

---
 command/repo.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/repo.go b/command/repo.go
index 55323c533..2d4da8c40 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -215,6 +215,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 var Confirm = func(prompt string, result *bool) error {
 	p := &survey.Confirm{
 		Message: prompt,
+		Default: true,
 	}
 	return survey.AskOne(p, result)
 }

From 1217bfce0917a5a0b2d3db76a112b95d39ecdc6a Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Wed, 26 Feb 2020 10:58:41 -0600
Subject: [PATCH 07/41] add spinner helper

---
 go.mod         | 1 +
 go.sum         | 4 ++++
 utils/utils.go | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/go.mod b/go.mod
index 458a7268e..94fb8e37c 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/AlecAivazis/survey/v2 v2.0.5
 	github.com/alecthomas/chroma v0.7.1 // indirect
+	github.com/briandowns/spinner v1.9.0
 	github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
diff --git a/go.sum b/go.sum
index 518f745aa..b187ae00c 100644
--- a/go.sum
+++ b/go.sum
@@ -27,6 +27,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/briandowns/spinner v1.9.0 h1:+OMAisemaHar1hjuJ3Z2hIvNhQl9Y7GLPWUwwz2Pxo8=
+github.com/briandowns/spinner v1.9.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8 h1:udjWAc2bbIP0LyzEMt7BWxk6O6lIoONWoonN3C9bMtA=
 github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8/go.mod h1:UsY1vFbaLp/j/SYgLfPH0n2I0jngBL+q6+mCAsESih4=
@@ -50,6 +52,8 @@ github.com/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg
 github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
diff --git a/utils/utils.go b/utils/utils.go
index a3af92fcb..fe7bcd4f7 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/briandowns/spinner"
 	"github.com/charmbracelet/glamour"
 	"github.com/cli/cli/pkg/browser"
 )
@@ -59,3 +60,7 @@ func FuzzyAgo(ago time.Duration) string {
 
 	return fmtDuration(int(ago.Hours()/24/365), "year")
 }
+
+func Spinner() *spinner.Spinner {
+	return spinner.New(spinner.CharSets[11], 400*time.Millisecond)
+}

From b02dac8f0bb53e596c4e88be21ff43867e031892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Wed, 26 Feb 2020 18:45:21 +0100
Subject: [PATCH 08/41] Accept more repo fields via flags to `repo create`

---
 api/queries_repo.go  | 41 ++++++++++++++++++++++++++++
 command/repo.go      | 65 ++++++++++++++++++++++++++------------------
 command/repo_test.go | 56 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 26 deletions(-)

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 9d0c4f00d..56959e86a 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -14,6 +14,7 @@ import (
 type Repository struct {
 	ID    string
 	Name  string
+	URL   string
 	Owner RepositoryOwner
 
 	IsPrivate        bool
@@ -216,3 +217,43 @@ func ForkRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 		ViewerPermission: "WRITE",
 	}, nil
 }
+
+// RepoCreateInput represents input parameters for RepoCreate
+type RepoCreateInput struct {
+	Name        string `json:"name"`
+	Visibility  string `json:"visibility"`
+	Homepage    string `json:"homepage,omitempty"`
+	Description string `json:"description,omitempty"`
+
+	HasIssuesEnabled bool `json:"hasIssuesEnabled"`
+	HasWikiEnabled   bool `json:"hasWikiEnabled"`
+}
+
+// RepoCreate creates a new GitHub repository
+func RepoCreate(client *Client, input RepoCreateInput) (*Repository, error) {
+	var response struct {
+		CreateRepository struct {
+			Repository Repository
+		}
+	}
+
+	variables := map[string]interface{}{
+		"input": input,
+	}
+
+	err := client.GraphQL(`
+	mutation($input: CreateRepositoryInput!) {
+		createRepository(input: $input) {
+			repository {
+				id
+				url
+			}
+		}
+	}
+	`, variables, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	return &response.CreateRepository.Repository, nil
+}
diff --git a/command/repo.go b/command/repo.go
index 7b8dd2728..905885c00 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -6,6 +6,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/cli/cli/api"
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/internal/ghrepo"
 	"github.com/cli/cli/utils"
@@ -16,6 +17,10 @@ func init() {
 	RootCmd.AddCommand(repoCmd)
 	repoCmd.AddCommand(repoCloneCmd)
 	repoCmd.AddCommand(repoCreateCmd)
+	repoCreateCmd.Flags().StringP("description", "d", "", "Description of repository")
+	repoCreateCmd.Flags().StringP("homepage", "h", "", "Repository home page URL")
+	repoCreateCmd.Flags().Bool("enable-issues", true, "Enable issues in the new repository")
+	repoCreateCmd.Flags().Bool("enable-wiki", true, "Enable wiki in the new repository")
 	repoCreateCmd.Flags().Bool("public", false, "Make the new repository public")
 	repoCmd.AddCommand(repoViewCmd)
 }
@@ -85,46 +90,54 @@ func repoCreate(cmd *cobra.Command, args []string) error {
 		name = path.Base(dir)
 	}
 
+	isPublic, err := cmd.Flags().GetBool("public")
+	if err != nil {
+		return err
+	}
+	hasIssuesEnabled, err := cmd.Flags().GetBool("enable-issues")
+	if err != nil {
+		return err
+	}
+	hasWikiEnabled, err := cmd.Flags().GetBool("enable-wiki")
+	if err != nil {
+		return err
+	}
+	description, err := cmd.Flags().GetString("description")
+	if err != nil {
+		return err
+	}
+	homepage, err := cmd.Flags().GetString("homepage")
+	if err != nil {
+		return err
+	}
+
+	// TODO: move this into constant within `api`
 	visibility := "PRIVATE"
-	if isPublic, err := cmd.Flags().GetBool("public"); err == nil && isPublic {
+	if isPublic {
 		visibility = "PUBLIC"
 	}
 
+	input := api.RepoCreateInput{
+		Name:             name,
+		Visibility:       visibility,
+		Description:      description,
+		Homepage:         homepage,
+		HasIssuesEnabled: hasIssuesEnabled,
+		HasWikiEnabled:   hasWikiEnabled,
+	}
+
 	ctx := contextForCommand(cmd)
 	client, err := apiClientForContext(ctx)
 	if err != nil {
 		return err
 	}
 
-	variables := map[string]interface{}{
-		"input": map[string]interface{}{
-			"name":       name,
-			"visibility": visibility,
-		},
-	}
-
-	var response struct {
-		CreateRepository struct {
-			Repository struct {
-				URL string
-			}
-		}
-	}
-
-	err = client.GraphQL(`
-	mutation($input: CreateRepositoryInput!) {
-		createRepository(input: $input) {
-			repository {
-				url
-			}
-		}
-	}
-	`, variables, &response)
+	repo, err := api.RepoCreate(client, input)
 	if err != nil {
 		return err
 	}
 
-	cmd.Println(response.CreateRepository.Repository.URL)
+	fmt.Fprintln(cmd.OutOrStdout(), repo.URL)
 	return nil
 }
 
diff --git a/command/repo_test.go b/command/repo_test.go
index 588ae3520..04bda3f6a 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -1,6 +1,9 @@
 package command
 
 import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
 	"os/exec"
 	"strings"
 	"testing"
@@ -61,6 +64,59 @@ func TestRepoClone(t *testing.T) {
 	}
 }
 
+func TestRepoCreate(t *testing.T) {
+	ctx := context.NewBlank()
+	ctx.SetBranch("master")
+	initContext = func() context.Context {
+		return ctx
+	}
+
+	http := initFakeHTTP()
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "data": { "createRepository": {
+		"repository": {
+			"id": "REPOID",
+			"url": "https://github.com/OWNER/REPO"
+		}
+	} } }
+	`))
+
+	var seenCmd *exec.Cmd
+	restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmd = cmd
+		return &outputStub{}
+	})
+	defer restoreCmd()
+
+	output, err := RunCommand(repoCreateCmd, "repo create REPO")
+	if err != nil {
+		t.Errorf("error running command `repo create`: %v", err)
+	}
+
+	eq(t, output.String(), "https://github.com/OWNER/REPO\n")
+	eq(t, output.Stderr(), "")
+
+	if seenCmd != nil {
+		t.Fatal("expected a command to run")
+	}
+
+	var reqBody struct {
+		Query     string
+		Variables struct {
+			Input map[string]interface{}
+		}
+	}
+
+	bodyBytes, _ := ioutil.ReadAll(http.Requests[0].Body)
+	json.Unmarshal(bodyBytes, &reqBody)
+	if repoName := reqBody.Variables.Input["name"].(string); repoName != "REPO" {
+		t.Errorf("expected %q, got %q", "REPO", repoName)
+	}
+	if repoVisibility := reqBody.Variables.Input["visibility"].(string); repoVisibility != "PRIVATE" {
+		t.Errorf("expected %q, got %q", "PRIVATE", repoVisibility)
+	}
+}
+
 func TestRepoView(t *testing.T) {
 	initBlankContext("OWNER/REPO", "master")
 	http := initFakeHTTP()

From 6371864835c6943df149c3e9c4d1fa39768a2045 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Wed, 26 Feb 2020 11:42:10 -0600
Subject: [PATCH 09/41] spruce up UX

---
 command/repo.go      | 25 ++++++++++++++++++-------
 command/repo_test.go | 32 +++++++++++++-------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 2d4da8c40..28f202211 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -132,33 +132,42 @@ func repoFork(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	greenCheck := utils.Green("✓")
+	redX := utils.Bold(utils.Red("X"))
 	out := colorableOut(cmd)
-	fmt.Fprintf(out, "Forking %s...\n", utils.Cyan(ghrepo.FullName(toFork)))
+	s := utils.Spinner()
+	loading := utils.Gray(fmt.Sprintf("Forking %s...", utils.Bold(utils.Gray(ghrepo.FullName(toFork)))))
+	s.Suffix = " " + loading
+	s.FinalMSG = utils.Gray(fmt.Sprintf("- %s\n", loading))
+	s.Start()
 
 	authLogin, err := ctx.AuthLogin()
 	if err != nil {
+		s.Stop()
 		return fmt.Errorf("could not determine current username: %w", err)
 	}
 
 	possibleFork := ghrepo.New(authLogin, toFork.RepoName())
 	exists, err := api.RepoExistsOnGitHub(apiClient, possibleFork)
 	if err != nil {
+		s.Stop()
 		return fmt.Errorf("problem with API request: %w", err)
 	}
 
 	if exists {
-		return fmt.Errorf("%s %s", utils.Cyan(ghrepo.FullName(possibleFork)), utils.Red("already exists!"))
+		s.Stop()
+		fmt.Fprintf(out, redX+" ")
+		return fmt.Errorf("%s already exists", utils.Bold(ghrepo.FullName(possibleFork)))
 	}
 
 	forkedRepo, err := api.ForkRepo(apiClient, toFork)
 	if err != nil {
+		s.Stop()
 		return fmt.Errorf("failed to fork: %w", err)
 	}
+	s.Stop()
 
-	fmt.Fprintf(out, "%s %s %s!\n",
-		utils.Cyan(ghrepo.FullName(toFork)),
-		utils.Green("successfully forked to"),
-		utils.Cyan(ghrepo.FullName(forkedRepo)))
+	fmt.Fprintf(out, "%s Created fork %s\n", greenCheck, utils.Bold(ghrepo.FullName(forkedRepo)))
 
 	if forceNo {
 		return nil
@@ -187,7 +196,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 				return fmt.Errorf("failed to fetch new remote: %w", err)
 			}
 
-			fmt.Fprintf(out, "%s %s\n", utils.Green("remote added at"), utils.Cyan("fork"))
+			fmt.Fprintf(out, "%s Remote added at %s\n", greenCheck, utils.Bold("fork"))
 		}
 	} else {
 		cloneDesired := forceYes
@@ -206,6 +215,8 @@ func repoFork(cmd *cobra.Command, args []string) error {
 			if err != nil {
 				return fmt.Errorf("failed to clone fork: %w", err)
 			}
+
+			fmt.Fprintf(out, "%s Cloned fork\n", greenCheck)
 		}
 	}
 
diff --git a/command/repo_test.go b/command/repo_test.go
index e44ae6820..43ff16605 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -29,7 +29,7 @@ func TestRepoFork_already_forked(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected repo fork to error")
 	}
-	if err.Error() != "someone/REPO already exists!" {
+	if err.Error() != "someone/REPO already exists" {
 		t.Errorf("unexpected error: %v", err)
 	}
 }
@@ -49,8 +49,7 @@ func TestRepoFork_in_parent(t *testing.T) {
 	eq(t, output.Stderr(), "")
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`Created fork someone/REPO`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -88,8 +87,7 @@ func TestRepoFork_outside(t *testing.T) {
 			eq(t, output.Stderr(), "")
 
 			expectedLines := []*regexp.Regexp{
-				regexp.MustCompile(`successfully forked to someone/REPO`),
-				regexp.MustCompile(`Forking OWNER/REPO`),
+				regexp.MustCompile(`Created fork someone/REPO`),
 			}
 			for _, r := range expectedLines {
 				if !r.MatchString(output.String()) {
@@ -131,9 +129,8 @@ func TestRepoFork_in_parent_yes(t *testing.T) {
 	eq(t, output.Stderr(), "")
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Forking OWNER/REPO`),
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`remote added at fork`),
+		regexp.MustCompile(`Created fork someone/REPO`),
+		regexp.MustCompile(`Remote added at fork`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -164,8 +161,8 @@ func TestRepoFork_outside_yes(t *testing.T) {
 	eq(t, strings.Join(seenCmd.Args, " "), "git clone https://github.com/someone/repo.git")
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`Created fork someone/REPO`),
+		regexp.MustCompile(`Cloned fork`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -203,8 +200,8 @@ func TestRepoFork_outside_survey_yes(t *testing.T) {
 	eq(t, strings.Join(seenCmd.Args, " "), "git clone https://github.com/someone/repo.git")
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`Created fork someone/REPO`),
+		regexp.MustCompile(`Cloned fork`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -242,8 +239,7 @@ func TestRepoFork_outside_survey_no(t *testing.T) {
 	eq(t, cmdRun, false)
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`Forking OWNER/REPO`),
+		regexp.MustCompile(`Created fork someone/REPO`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -290,9 +286,8 @@ func TestRepoFork_in_parent_survey_yes(t *testing.T) {
 	eq(t, output.Stderr(), "")
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Forking OWNER/REPO`),
-		regexp.MustCompile(`successfully forked to someone/REPO`),
-		regexp.MustCompile(`remote added at fork`),
+		regexp.MustCompile(`Created fork someone/REPO`),
+		regexp.MustCompile(`Remote added at fork`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -332,8 +327,7 @@ func TestRepoFork_in_parent_survey_no(t *testing.T) {
 	eq(t, cmdRun, false)
 
 	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Forking OWNER/REPO`),
-		regexp.MustCompile(`successfully forked to someone/REPO`),
+		regexp.MustCompile(`Created fork someone/REPO`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {

From e38c15e2c9dd00ee6a2f9cc88df721cdb1add427 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Wed, 26 Feb 2020 11:56:00 -0600
Subject: [PATCH 10/41] fix ellipsis color

---
 command/repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/repo.go b/command/repo.go
index 28f202211..3fb758f3c 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -136,7 +136,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	redX := utils.Bold(utils.Red("X"))
 	out := colorableOut(cmd)
 	s := utils.Spinner()
-	loading := utils.Gray(fmt.Sprintf("Forking %s...", utils.Bold(utils.Gray(ghrepo.FullName(toFork)))))
+	loading := utils.Gray("Forking ") + utils.Bold(utils.Gray(ghrepo.FullName(toFork))) + utils.Gray("...")
 	s.Suffix = " " + loading
 	s.FinalMSG = utils.Gray(fmt.Sprintf("- %s\n", loading))
 	s.Start()

From 4a56280ab5366b61c2ec3679cad1771dc5399256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Wed, 26 Feb 2020 19:53:01 +0100
Subject: [PATCH 11/41] Automatically add `origin` remote after `repo create`

---
 command/repo.go      | 8 ++++++++
 command/repo_test.go | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/command/repo.go b/command/repo.go
index 905885c00..40e3847fb 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -137,6 +137,14 @@ func repoCreate(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	remoteAdd := git.GitCommand("remote", "add", "origin", repo.URL+".git")
+	remoteAdd.Stdout = os.Stdout
+	remoteAdd.Stderr = os.Stderr
+	err = utils.PrepareCmd(remoteAdd).Run()
+	if err != nil {
+		return err
+	}
+
 	fmt.Fprintln(cmd.OutOrStdout(), repo.URL)
 	return nil
 }
diff --git a/command/repo_test.go b/command/repo_test.go
index 04bda3f6a..e6cea29a8 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -96,9 +96,10 @@ func TestRepoCreate(t *testing.T) {
 	eq(t, output.String(), "https://github.com/OWNER/REPO\n")
 	eq(t, output.Stderr(), "")
 
-	if seenCmd != nil {
+	if seenCmd == nil {
 		t.Fatal("expected a command to run")
 	}
+	eq(t, strings.Join(seenCmd.Args, " "), "git remote add origin https://github.com/OWNER/REPO.git")
 
 	var reqBody struct {
 		Query     string

From 4e97a0e05d6032c1e8771d513392dd67b206896f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Wed, 26 Feb 2020 19:53:18 +0100
Subject: [PATCH 12/41] Have correct command be run in `repo clone` test

---
 command/repo_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/repo_test.go b/command/repo_test.go
index e6cea29a8..82cae32c7 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -48,7 +48,7 @@ func TestRepoClone(t *testing.T) {
 			})
 			defer restoreCmd()
 
-			output, err := RunCommand(repoViewCmd, tt.args)
+			output, err := RunCommand(repoCloneCmd, tt.args)
 			if err != nil {
 				t.Fatalf("error running command `repo clone`: %v", err)
 			}

From 256bdabf03576e4f5a9998a2fb6d2f117042e2a5 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Wed, 26 Feb 2020 16:48:29 -0600
Subject: [PATCH 13/41] slight refactor

I didn't initially use GitHubRepo because it had the weird error
wrapping. I poked around and I think this function is leftover from a
vestigial GitHubRepoID function that used to be more single-purpose. I
took out the weird error handling so it could be reused and then used it
from the new GitHubRepoExists.
---
 api/queries_repo.go | 28 ++++------------------------
 command/repo.go     |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 16060abc5..913307765 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -60,23 +60,8 @@ func (r Repository) ViewerCanPush() bool {
 	}
 }
 
-func RepoExistsOnGitHub(client *Client, repo ghrepo.Interface) (bool, error) {
-	query := `
-	query($owner: String!, $name: String!) {
-		repository(owner: $owner, name: $name) {
-			id
-		}
-	}
-	`
-	variables := map[string]interface{}{
-		"owner": repo.RepoOwner(),
-		"name":  repo.RepoName(),
-	}
-
-	result := struct {
-		Repository Repository
-	}{}
-	err := client.GraphQL(query, variables, &result)
+func GitHubRepoExists(client *Client, repo ghrepo.Interface) (bool, error) {
+	repo, err := GitHubRepo(client, repo)
 
 	if err == nil {
 		// we found it.
@@ -100,7 +85,6 @@ func RepoExistsOnGitHub(client *Client, repo ghrepo.Interface) (bool, error) {
 	return false, err
 }
 
-// GitHubRepo looks up the node ID of a named repository
 func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	query := `
 	query($owner: String!, $name: String!) {
@@ -119,12 +103,8 @@ func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	}{}
 	err := client.GraphQL(query, variables, &result)
 
-	if err != nil || result.Repository.ID == "" {
-		newErr := fmt.Errorf("failed to determine repository ID for '%s'", ghrepo.FullName(repo))
-		if err != nil {
-			newErr = fmt.Errorf("%s: %w", newErr, err)
-		}
-		return nil, newErr
+	if err != nil {
+		return nil, err
 	}
 
 	return &result.Repository, nil
diff --git a/command/repo.go b/command/repo.go
index 3fb758f3c..528859129 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -148,7 +148,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	}
 
 	possibleFork := ghrepo.New(authLogin, toFork.RepoName())
-	exists, err := api.RepoExistsOnGitHub(apiClient, possibleFork)
+	exists, err := api.GitHubRepoExists(apiClient, possibleFork)
 	if err != nil {
 		s.Stop()
 		return fmt.Errorf("problem with API request: %w", err)

From 115bf37bbd119c61e77637b86ffb2528d333e972 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Wed, 26 Feb 2020 17:08:48 -0600
Subject: [PATCH 14/41] switch to --clone/--remote

---
 command/repo.go      | 18 +++++++++---------
 command/repo_test.go | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 528859129..98b589b1b 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -21,8 +21,8 @@ func init() {
 	repoCmd.AddCommand(repoViewCmd)
 	repoCmd.AddCommand(repoForkCmd)
 
-	repoForkCmd.Flags().BoolP("yes", "y", false, "Run non-interactively, saying yes to prompts")
-	repoForkCmd.Flags().BoolP("no", "n", false, "Run non-interactively, saying no to prompts")
+	repoForkCmd.Flags().StringP("clone", "c", "prompt", "prompt: prompt about cloning fork. true: clone fork. false: never clone fork")
+	repoForkCmd.Flags().StringP("remote", "r", "prompt", "prompt: prompt about adding remote for fork. true: add remote for fork. false: never add remote fork")
 }
 
 var repoCmd = &cobra.Command{
@@ -87,11 +87,11 @@ func isURL(arg string) bool {
 func repoFork(cmd *cobra.Command, args []string) error {
 	ctx := contextForCommand(cmd)
 
-	forceYes, err := cmd.Flags().GetBool("yes")
+	clonePref, err := cmd.Flags().GetString("clone")
 	if err != nil {
 		return err
 	}
-	forceNo, err := cmd.Flags().GetBool("no")
+	remotePref, err := cmd.Flags().GetString("remote")
 	if err != nil {
 		return err
 	}
@@ -169,13 +169,13 @@ func repoFork(cmd *cobra.Command, args []string) error {
 
 	fmt.Fprintf(out, "%s Created fork %s\n", greenCheck, utils.Bold(ghrepo.FullName(forkedRepo)))
 
-	if forceNo {
+	if (inParent && remotePref == "false") || (!inParent && clonePref == "false") {
 		return nil
 	}
 
 	if inParent {
-		remoteDesired := forceYes
-		if !forceYes {
+		remoteDesired := remotePref == "true"
+		if remotePref == "prompt" {
 			err = Confirm("Would you like to add a remote for the new fork?", &remoteDesired)
 			if err != nil {
 				return fmt.Errorf("failed to prompt: %w", err)
@@ -199,8 +199,8 @@ func repoFork(cmd *cobra.Command, args []string) error {
 			fmt.Fprintf(out, "%s Remote added at %s\n", greenCheck, utils.Bold("fork"))
 		}
 	} else {
-		cloneDesired := forceYes
-		if !forceYes {
+		cloneDesired := clonePref == "true"
+		if clonePref == "prompt" {
 			err = Confirm("Would you like to clone the new fork?", &cloneDesired)
 			if err != nil {
 				return fmt.Errorf("failed to prompt: %w", err)
diff --git a/command/repo_test.go b/command/repo_test.go
index 43ff16605..402c27aba 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -25,7 +25,7 @@ func TestRepoFork_already_forked(t *testing.T) {
 	http.StubRepoResponse("OWNER", "REPO")
 	defer http.StubWithFixture(200, "repo.json")()
 
-	_, err := RunCommand(repoForkCmd, "repo fork -n")
+	_, err := RunCommand(repoForkCmd, "repo fork --remote=false")
 	if err == nil {
 		t.Errorf("expected repo fork to error")
 	}
@@ -41,7 +41,7 @@ func TestRepoFork_in_parent(t *testing.T) {
 	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
-	output, err := RunCommand(repoForkCmd, "repo fork -n")
+	output, err := RunCommand(repoForkCmd, "repo fork --remote=false")
 	if err != nil {
 		t.Errorf("error running command `repo fork`: %v", err)
 	}
@@ -66,11 +66,11 @@ func TestRepoFork_outside(t *testing.T) {
 	}{
 		{
 			name: "url arg",
-			args: "repo fork -n http://github.com/OWNER/REPO.git",
+			args: "repo fork --clone=false http://github.com/OWNER/REPO.git",
 		},
 		{
 			name: "full name arg",
-			args: "repo fork -n OWNER/REPO",
+			args: "repo fork --clone=false OWNER/REPO",
 		},
 	}
 	for _, tt := range tests {
@@ -112,7 +112,7 @@ func TestRepoFork_in_parent_yes(t *testing.T) {
 		return &outputStub{}
 	})()
 
-	output, err := RunCommand(repoForkCmd, "repo fork -y")
+	output, err := RunCommand(repoForkCmd, "repo fork --remote=true")
 	if err != nil {
 		t.Errorf("error running command `repo fork`: %v", err)
 	}
@@ -151,7 +151,7 @@ func TestRepoFork_outside_yes(t *testing.T) {
 		return &outputStub{}
 	})()
 
-	output, err := RunCommand(repoForkCmd, "repo fork -y OWNER/REPO")
+	output, err := RunCommand(repoForkCmd, "repo fork --clone=true OWNER/REPO")
 	if err != nil {
 		t.Errorf("error running command `repo fork`: %v", err)
 	}

From 7fad2d05fb43dc03cb195580c44aee91a5acb111 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Thu, 27 Feb 2020 16:43:44 -0600
Subject: [PATCH 15/41] switch to alternate method for determining if repo
 already forked

---
 api/queries_repo.go             | 26 +++++++++++++++-----------
 command/repo.go                 | 29 ++++++++++++++++++-----------
 command/repo_test.go            | 29 ++++++++++++++++++++---------
 test/fixtures/forkResult.json   |  1 +
 test/fixtures/repo.json         |  7 -------
 test/fixtures/repoNotFound.json | 20 --------------------
 6 files changed, 54 insertions(+), 58 deletions(-)
 delete mode 100644 test/fixtures/repo.json
 delete mode 100644 test/fixtures/repoNotFound.json

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 913307765..3b31d8efe 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -6,16 +6,18 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/cli/cli/internal/ghrepo"
 )
 
 // Repository contains information about a GitHub repo
 type Repository struct {
-	ID       string
-	Name     string
-	CloneURL string
-	Owner    RepositoryOwner
+	ID        string
+	Name      string
+	CloneURL  string
+	CreatedAt time.Time
+	Owner     RepositoryOwner
 
 	IsPrivate        bool
 	HasIssuesEnabled bool
@@ -211,10 +213,11 @@ func RepoNetwork(client *Client, repos []ghrepo.Interface) (RepoNetworkResult, e
 
 // repositoryV3 is the repository result from GitHub API v3
 type repositoryV3 struct {
-	NodeID   string
-	Name     string
-	CloneURL string `json:"clone_url"`
-	Owner    struct {
+	NodeID    string
+	Name      string
+	CreatedAt time.Time `json:"created_at"`
+	CloneURL  string    `json:"clone_url"`
+	Owner     struct {
 		Login string
 	}
 }
@@ -230,9 +233,10 @@ func ForkRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	}
 
 	return &Repository{
-		ID:       result.NodeID,
-		Name:     result.Name,
-		CloneURL: result.CloneURL,
+		ID:        result.NodeID,
+		Name:      result.Name,
+		CloneURL:  result.CloneURL,
+		CreatedAt: result.CreatedAt,
 		Owner: RepositoryOwner{
 			Login: result.Owner.Login,
 		},
diff --git a/command/repo.go b/command/repo.go
index 98b589b1b..c8db87266 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -5,6 +5,7 @@ import (
 	"net/url"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/cli/cli/api"
 	"github.com/cli/cli/git"
@@ -84,6 +85,10 @@ func isURL(arg string) bool {
 	return strings.HasPrefix(arg, "http:/") || strings.HasPrefix(arg, "https:/")
 }
 
+var Since = func(t time.Time) time.Duration {
+	return time.Since(t)
+}
+
 func repoFork(cmd *cobra.Command, args []string) error {
 	ctx := contextForCommand(cmd)
 
@@ -148,23 +153,25 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	}
 
 	possibleFork := ghrepo.New(authLogin, toFork.RepoName())
-	exists, err := api.GitHubRepoExists(apiClient, possibleFork)
-	if err != nil {
-		s.Stop()
-		return fmt.Errorf("problem with API request: %w", err)
-	}
-
-	if exists {
-		s.Stop()
-		fmt.Fprintf(out, redX+" ")
-		return fmt.Errorf("%s already exists", utils.Bold(ghrepo.FullName(possibleFork)))
-	}
 
 	forkedRepo, err := api.ForkRepo(apiClient, toFork)
 	if err != nil {
 		s.Stop()
 		return fmt.Errorf("failed to fork: %w", err)
 	}
+
+	// This is weird. There is not an efficient way to determine via the GitHub API whether or not a
+	// given user has forked a given repo. We noticed, also, that the create fork API endpoint just
+	// returns the fork repo data even if it already exists -- with no change in status code or
+	// anything. We thus check the created time to see if the repo is brand new or not; if it's not,
+	// we assume the fork already existed and report an error.
+	created_ago := Since(forkedRepo.CreatedAt)
+	if created_ago > time.Minute {
+		s.Stop()
+		fmt.Fprintf(out, redX+" ")
+		return fmt.Errorf("%s already exists", utils.Bold(ghrepo.FullName(possibleFork)))
+	}
+
 	s.Stop()
 
 	fmt.Fprintf(out, "%s Created fork %s\n", greenCheck, utils.Bold(ghrepo.FullName(forkedRepo)))
diff --git a/command/repo_test.go b/command/repo_test.go
index 402c27aba..0a72dd2bd 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -5,6 +5,7 @@ import (
 	"regexp"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/cli/cli/context"
 	"github.com/cli/cli/utils"
@@ -23,7 +24,7 @@ func TestRepoFork_already_forked(t *testing.T) {
 	}
 	http := initFakeHTTP()
 	http.StubRepoResponse("OWNER", "REPO")
-	defer http.StubWithFixture(200, "repo.json")()
+	defer http.StubWithFixture(200, "forkResult.json")()
 
 	_, err := RunCommand(repoForkCmd, "repo fork --remote=false")
 	if err == nil {
@@ -34,11 +35,21 @@ func TestRepoFork_already_forked(t *testing.T) {
 	}
 }
 
+func stubSince(d time.Duration) func() {
+	originalSince := Since
+	Since = func(t time.Time) time.Duration {
+		return d
+	}
+	return func() {
+		Since = originalSince
+	}
+}
+
 func TestRepoFork_in_parent(t *testing.T) {
 	initBlankContext("OWNER/REPO", "master")
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
 	http.StubRepoResponse("OWNER", "REPO")
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	output, err := RunCommand(repoForkCmd, "repo fork --remote=false")
@@ -75,8 +86,8 @@ func TestRepoFork_outside(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			defer stubSince(2 * time.Second)()
 			http := initFakeHTTP()
-			defer http.StubWithFixture(200, "repoNotFound.json")()
 			defer http.StubWithFixture(200, "forkResult.json")()
 
 			output, err := RunCommand(repoForkCmd, tt.args)
@@ -101,9 +112,9 @@ func TestRepoFork_outside(t *testing.T) {
 
 func TestRepoFork_in_parent_yes(t *testing.T) {
 	initBlankContext("OWNER/REPO", "master")
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
 	http.StubRepoResponse("OWNER", "REPO")
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	var seenCmds []*exec.Cmd
@@ -141,8 +152,8 @@ func TestRepoFork_in_parent_yes(t *testing.T) {
 }
 
 func TestRepoFork_outside_yes(t *testing.T) {
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	var seenCmd *exec.Cmd
@@ -173,8 +184,8 @@ func TestRepoFork_outside_yes(t *testing.T) {
 }
 
 func TestRepoFork_outside_survey_yes(t *testing.T) {
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	var seenCmd *exec.Cmd
@@ -212,8 +223,8 @@ func TestRepoFork_outside_survey_yes(t *testing.T) {
 }
 
 func TestRepoFork_outside_survey_no(t *testing.T) {
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	cmdRun := false
@@ -251,9 +262,9 @@ func TestRepoFork_outside_survey_no(t *testing.T) {
 
 func TestRepoFork_in_parent_survey_yes(t *testing.T) {
 	initBlankContext("OWNER/REPO", "master")
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
 	http.StubRepoResponse("OWNER", "REPO")
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	var seenCmds []*exec.Cmd
@@ -299,9 +310,9 @@ func TestRepoFork_in_parent_survey_yes(t *testing.T) {
 
 func TestRepoFork_in_parent_survey_no(t *testing.T) {
 	initBlankContext("OWNER/REPO", "master")
+	defer stubSince(2 * time.Second)()
 	http := initFakeHTTP()
 	http.StubRepoResponse("OWNER", "REPO")
-	defer http.StubWithFixture(200, "repoNotFound.json")()
 	defer http.StubWithFixture(200, "forkResult.json")()
 
 	cmdRun := false
diff --git a/test/fixtures/forkResult.json b/test/fixtures/forkResult.json
index 3b6ab671b..e3f885642 100644
--- a/test/fixtures/forkResult.json
+++ b/test/fixtures/forkResult.json
@@ -2,6 +2,7 @@
   "node_id": "123",
   "name": "REPO",
   "clone_url": "https://github.com/someone/repo.git",
+  "created_at": "2011-01-26T19:01:12Z",
   "owner": {
     "login": "someone"
   }
diff --git a/test/fixtures/repo.json b/test/fixtures/repo.json
deleted file mode 100644
index 893c1f2c2..000000000
--- a/test/fixtures/repo.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "repository": {
-      "id": "MDEwOlJlcG9zaXRvcnkyMTI2MTMwNDk="
-    }
-  }
-}
diff --git a/test/fixtures/repoNotFound.json b/test/fixtures/repoNotFound.json
deleted file mode 100644
index ac6ed2adc..000000000
--- a/test/fixtures/repoNotFound.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "data": {
-    "repository": null
-  },
-  "errors": [
-    {
-      "type": "NOT_FOUND",
-      "path": [
-        "repository"
-      ],
-      "locations": [
-        {
-          "line": 2,
-          "column": 3
-        }
-      ],
-      "message": "Could not resolve to a Repository with the name 'REPO'."
-    }
-  ]
-}

From 8c473a27799ad46817bb357ae0506c213619ef86 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Thu, 27 Feb 2020 16:44:02 -0600
Subject: [PATCH 16/41] shorten some english

---
 command/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index c8db87266..d07eaf79b 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -22,8 +22,8 @@ func init() {
 	repoCmd.AddCommand(repoViewCmd)
 	repoCmd.AddCommand(repoForkCmd)
 
-	repoForkCmd.Flags().StringP("clone", "c", "prompt", "prompt: prompt about cloning fork. true: clone fork. false: never clone fork")
-	repoForkCmd.Flags().StringP("remote", "r", "prompt", "prompt: prompt about adding remote for fork. true: add remote for fork. false: never add remote fork")
+	repoForkCmd.Flags().StringP("clone", "c", "prompt", "true: clone fork. false: never clone fork")
+	repoForkCmd.Flags().StringP("remote", "r", "prompt", "true: add remote for fork. false: never add remote fork")
 }
 
 var repoCmd = &cobra.Command{

From 3019137133a8d3d57f9fab0a10a06ef5512157f8 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Thu, 27 Feb 2020 16:46:12 -0600
Subject: [PATCH 17/41] no longer needed

---
 api/queries_repo.go | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 3b31d8efe..8cd8f6f42 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -62,31 +62,6 @@ func (r Repository) ViewerCanPush() bool {
 	}
 }
 
-func GitHubRepoExists(client *Client, repo ghrepo.Interface) (bool, error) {
-	repo, err := GitHubRepo(client, repo)
-
-	if err == nil {
-		// we found it.
-		return true, nil
-	}
-
-	// we didn't find it, but need to determine if we hit an error or it just doesn't exist.
-	graphqlError, isGraphQLError := err.(*GraphQLErrorResponse)
-	if isGraphQLError {
-		tolerated := true
-		for _, ge := range graphqlError.Errors {
-			if ge.Type != "NOT_FOUND" {
-				tolerated = false
-			}
-		}
-		if tolerated {
-			err = nil
-		}
-	}
-
-	return false, err
-}
-
 func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	query := `
 	query($owner: String!, $name: String!) {

From 5d44d9f483ce48b3b758be1a9533e7d7f9ecc3e5 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Thu, 27 Feb 2020 16:55:31 -0600
Subject: [PATCH 18/41] tweak flag settings

---
 command/repo.go      | 6 ++++--
 command/repo_test.go | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index d07eaf79b..c317a553d 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -22,8 +22,10 @@ func init() {
 	repoCmd.AddCommand(repoViewCmd)
 	repoCmd.AddCommand(repoForkCmd)
 
-	repoForkCmd.Flags().StringP("clone", "c", "prompt", "true: clone fork. false: never clone fork")
-	repoForkCmd.Flags().StringP("remote", "r", "prompt", "true: add remote for fork. false: never add remote fork")
+	repoForkCmd.Flags().StringP("clone", "c", "prompt", "Clone fork. Pass false to not clone fork.")
+	repoForkCmd.Flags().StringP("remote", "r", "prompt", "Add remote for fork. Pass false to not add remote.")
+	repoForkCmd.Flags().Lookup("clone").NoOptDefVal = "true"
+	repoForkCmd.Flags().Lookup("remote").NoOptDefVal = "true"
 }
 
 var repoCmd = &cobra.Command{
diff --git a/command/repo_test.go b/command/repo_test.go
index 0a72dd2bd..8ca5709d5 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -123,7 +123,7 @@ func TestRepoFork_in_parent_yes(t *testing.T) {
 		return &outputStub{}
 	})()
 
-	output, err := RunCommand(repoForkCmd, "repo fork --remote=true")
+	output, err := RunCommand(repoForkCmd, "repo fork --remote")
 	if err != nil {
 		t.Errorf("error running command `repo fork`: %v", err)
 	}
@@ -162,7 +162,7 @@ func TestRepoFork_outside_yes(t *testing.T) {
 		return &outputStub{}
 	})()
 
-	output, err := RunCommand(repoForkCmd, "repo fork --clone=true OWNER/REPO")
+	output, err := RunCommand(repoForkCmd, "repo fork --clone OWNER/REPO")
 	if err != nil {
 		t.Errorf("error running command `repo fork`: %v", err)
 	}

From bb65bda62f69100473079a0db0db29a993dc67fe Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Fri, 28 Feb 2020 10:28:36 -0600
Subject: [PATCH 19/41] escape codes in errors render v poorly in windows

---
 command/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index c317a553d..5dc4ffcb9 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -170,8 +170,8 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	created_ago := Since(forkedRepo.CreatedAt)
 	if created_ago > time.Minute {
 		s.Stop()
-		fmt.Fprintf(out, redX+" ")
-		return fmt.Errorf("%s already exists", utils.Bold(ghrepo.FullName(possibleFork)))
+		fmt.Fprint(out, redX+" ")
+		return fmt.Errorf("%s already exists", ghrepo.FullName(possibleFork))
 	}
 
 	s.Stop()

From 201217d88ab075eb92482a61649865d822cde365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Mon, 2 Mar 2020 11:35:20 +0100
Subject: [PATCH 20/41] Fix detecting PR for current branch pushed to fork

Now passing base repo as reference to `prSelectorForCurrentBranch()` so
that it doesn't have to (inexactly) determine the base repo itself and
risk it being different than the base repo determined during `pr
status/view`.
---
 api/fake_http.go                | 33 +++++++++++++++++++++++++++++++++
 command/pr.go                   | 17 +++++++----------
 command/pr_test.go              | 30 ++++++++++++++++++++++++++++++
 test/fixtures/prStatusFork.json | 31 +++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/prStatusFork.json

diff --git a/api/fake_http.go b/api/fake_http.go
index 32b7d56eb..6a3605b0b 100644
--- a/api/fake_http.go
+++ b/api/fake_http.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"strings"
 )
 
 // FakeHTTP provides a mechanism by which to stub HTTP responses through
@@ -56,3 +57,35 @@ func (f *FakeHTTP) StubRepoResponse(owner, repo string) {
 	}
 	f.responseStubs = append(f.responseStubs, resp)
 }
+
+func (f *FakeHTTP) StubForkedRepoResponse(forkFullName, parentFullName string) {
+	forkRepo := strings.SplitN(forkFullName, "/", 2)
+	parentRepo := strings.SplitN(parentFullName, "/", 2)
+	body := bytes.NewBufferString(fmt.Sprintf(`
+		{ "data": { "repo_000": {
+			"id": "REPOID2",
+			"name": "%s",
+			"owner": {"login": "%s"},
+			"defaultBranchRef": {
+				"name": "master",
+				"target": {"oid": "deadbeef"}
+			},
+			"viewerPermission": "ADMIN",
+			"parent": {
+				"id": "REPOID1",
+				"name": "%s",
+				"owner": {"login": "%s"},
+				"defaultBranchRef": {
+					"name": "master",
+					"target": {"oid": "deadbeef"}
+				},
+				"viewerPermission": "READ"
+			}
+		} } }
+	`, forkRepo[1], forkRepo[0], parentRepo[1], parentRepo[0]))
+	resp := &http.Response{
+		StatusCode: 200,
+		Body:       ioutil.NopCloser(body),
+	}
+	f.responseStubs = append(f.responseStubs, resp)
+}
diff --git a/command/pr.go b/command/pr.go
index a318154be..e6427aebb 100644
--- a/command/pr.go
+++ b/command/pr.go
@@ -71,10 +71,6 @@ func prStatus(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx)
-	if err != nil {
-		return err
-	}
 	currentUser, err := ctx.AuthLogin()
 	if err != nil {
 		return err
@@ -85,6 +81,11 @@ func prStatus(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx, baseRepo)
+	if err != nil {
+		return err
+	}
+
 	prPayload, err := api.PullRequests(apiClient, baseRepo, currentPRNumber, currentPRHeadRef, currentUser)
 	if err != nil {
 		return err
@@ -275,7 +276,7 @@ func prView(cmd *cobra.Command, args []string) error {
 		}
 		openURL = pr.URL
 	} else {
-		prNumber, branchWithOwner, err := prSelectorForCurrentBranch(ctx)
+		prNumber, branchWithOwner, err := prSelectorForCurrentBranch(ctx, baseRepo)
 		if err != nil {
 			return err
 		}
@@ -345,11 +346,7 @@ func prFromArg(apiClient *api.Client, baseRepo ghrepo.Interface, arg string) (*a
 	return api.PullRequestForBranch(apiClient, baseRepo, arg)
 }
 
-func prSelectorForCurrentBranch(ctx context.Context) (prNumber int, prHeadRef string, err error) {
-	baseRepo, err := ctx.BaseRepo()
-	if err != nil {
-		return
-	}
+func prSelectorForCurrentBranch(ctx context.Context, baseRepo ghrepo.Interface) (prNumber int, prHeadRef string, err error) {
 	prHeadRef, err = ctx.Branch()
 	if err != nil {
 		return
diff --git a/command/pr_test.go b/command/pr_test.go
index efa894802..51469342a 100644
--- a/command/pr_test.go
+++ b/command/pr_test.go
@@ -98,6 +98,36 @@ func TestPRStatus(t *testing.T) {
 	}
 }
 
+func TestPRStatus_fork(t *testing.T) {
+	initBlankContext("OWNER/REPO", "blueberries")
+	http := initFakeHTTP()
+	http.StubForkedRepoResponse("OWNER/REPO", "PARENT/REPO")
+
+	jsonFile, _ := os.Open("../test/fixtures/prStatusFork.json")
+	defer jsonFile.Close()
+	http.StubResponse(200, jsonFile)
+
+	defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		switch strings.Join(cmd.Args, " ") {
+		case `git config --get-regexp ^branch\.blueberries\.(remote|merge)$`:
+			return &outputStub{[]byte(`branch.blueberries.remote origin
+branch.blueberries.merge refs/heads/blueberries`)}
+		default:
+			panic("not implemented")
+		}
+	})()
+
+	output, err := RunCommand(prStatusCmd, "pr status")
+	if err != nil {
+		t.Fatalf("error running command `pr status`: %v", err)
+	}
+
+	branchRE := regexp.MustCompile(`#10.*\[OWNER:blueberries\]`)
+	if !branchRE.MatchString(output.String()) {
+		t.Errorf("did not match current branch:\n%v", output.String())
+	}
+}
+
 func TestPRStatus_reviewsAndChecks(t *testing.T) {
 	initBlankContext("OWNER/REPO", "blueberries")
 	http := initFakeHTTP()
diff --git a/test/fixtures/prStatusFork.json b/test/fixtures/prStatusFork.json
new file mode 100644
index 000000000..df184aaea
--- /dev/null
+++ b/test/fixtures/prStatusFork.json
@@ -0,0 +1,31 @@
+{
+  "data": {
+    "repository": {
+      "pullRequests": {
+        "totalCount": 1,
+        "edges": [
+          {
+            "node": {
+              "number": 10,
+              "title": "Blueberries are a good fruit",
+              "url": "https://github.com/PARENT/REPO/pull/10",
+              "headRefName": "blueberries",
+              "headRepositoryOwner": {
+                "login": "OWNER"
+              },
+              "isCrossRepository": true
+            }
+          }
+        ]
+      }
+    },
+    "viewerCreated": {
+      "totalCount": 0,
+      "edges": []
+    },
+    "reviewRequested": {
+      "totalCount": 0,
+      "edges": []
+    }
+  }
+}

From 6a57f04285ed12945c6c0e67658513633b7fbfa4 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 2 Mar 2020 14:37:08 -0600
Subject: [PATCH 21/41] allow continuing if already forked

---
 command/repo.go      | 19 +++++++++----------
 command/repo_test.go | 12 +++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 5dc4ffcb9..b76e88e64 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -140,7 +140,6 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	}
 
 	greenCheck := utils.Green("✓")
-	redX := utils.Bold(utils.Red("X"))
 	out := colorableOut(cmd)
 	s := utils.Spinner()
 	loading := utils.Gray("Forking ") + utils.Bold(utils.Gray(ghrepo.FullName(toFork))) + utils.Gray("...")
@@ -162,6 +161,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to fork: %w", err)
 	}
 
+	s.Stop()
 	// This is weird. There is not an efficient way to determine via the GitHub API whether or not a
 	// given user has forked a given repo. We noticed, also, that the create fork API endpoint just
 	// returns the fork repo data even if it already exists -- with no change in status code or
@@ -169,15 +169,14 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	// we assume the fork already existed and report an error.
 	created_ago := Since(forkedRepo.CreatedAt)
 	if created_ago > time.Minute {
-		s.Stop()
-		fmt.Fprint(out, redX+" ")
-		return fmt.Errorf("%s already exists", ghrepo.FullName(possibleFork))
+		fmt.Fprintf(out, "%s %s %s\n",
+			utils.Yellow("!"),
+			utils.Bold(ghrepo.FullName(possibleFork)),
+			"already exists")
+	} else {
+		fmt.Fprintf(out, "%s Created fork %s\n", greenCheck, utils.Bold(ghrepo.FullName(forkedRepo)))
 	}
 
-	s.Stop()
-
-	fmt.Fprintf(out, "%s Created fork %s\n", greenCheck, utils.Bold(ghrepo.FullName(forkedRepo)))
-
 	if (inParent && remotePref == "false") || (!inParent && clonePref == "false") {
 		return nil
 	}
@@ -185,7 +184,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	if inParent {
 		remoteDesired := remotePref == "true"
 		if remotePref == "prompt" {
-			err = Confirm("Would you like to add a remote for the new fork?", &remoteDesired)
+			err = Confirm("Would you like to add a remote for the fork?", &remoteDesired)
 			if err != nil {
 				return fmt.Errorf("failed to prompt: %w", err)
 			}
@@ -210,7 +209,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
 	} else {
 		cloneDesired := clonePref == "true"
 		if clonePref == "prompt" {
-			err = Confirm("Would you like to clone the new fork?", &cloneDesired)
+			err = Confirm("Would you like to clone the fork?", &cloneDesired)
 			if err != nil {
 				return fmt.Errorf("failed to prompt: %w", err)
 			}
diff --git a/command/repo_test.go b/command/repo_test.go
index 8ca5709d5..bf94057d2 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -26,12 +26,14 @@ func TestRepoFork_already_forked(t *testing.T) {
 	http.StubRepoResponse("OWNER", "REPO")
 	defer http.StubWithFixture(200, "forkResult.json")()
 
-	_, err := RunCommand(repoForkCmd, "repo fork --remote=false")
-	if err == nil {
-		t.Errorf("expected repo fork to error")
+	output, err := RunCommand(repoForkCmd, "repo fork --remote=false")
+	if err != nil {
+		t.Errorf("got unexpected error: %v", err)
 	}
-	if err.Error() != "someone/REPO already exists" {
-		t.Errorf("unexpected error: %v", err)
+	r := regexp.MustCompile(`someone/REPO already exists`)
+	if !r.MatchString(output.String()) {
+		t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+		return
 	}
 }
 

From 48a6bbf043fea22630cac3b737e38e25d253e680 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 2 Mar 2020 14:38:49 -0600
Subject: [PATCH 22/41] minor golfing

---
 command/repo_test.go | 48 +++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/command/repo_test.go b/command/repo_test.go
index bf94057d2..eccbfa4fb 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -61,14 +61,10 @@ func TestRepoFork_in_parent(t *testing.T) {
 
 	eq(t, output.Stderr(), "")
 
-	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Created fork someone/REPO`),
-	}
-	for _, r := range expectedLines {
-		if !r.MatchString(output.String()) {
-			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
-			return
-		}
+	r := regexp.MustCompile(`Created fork someone/REPO`)
+	if !r.MatchString(output.String()) {
+		t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+		return
 	}
 }
 
@@ -99,14 +95,10 @@ func TestRepoFork_outside(t *testing.T) {
 
 			eq(t, output.Stderr(), "")
 
-			expectedLines := []*regexp.Regexp{
-				regexp.MustCompile(`Created fork someone/REPO`),
-			}
-			for _, r := range expectedLines {
-				if !r.MatchString(output.String()) {
-					t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
-					return
-				}
+			r := regexp.MustCompile(`Created fork someone/REPO`)
+			if !r.MatchString(output.String()) {
+				t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+				return
 			}
 		})
 	}
@@ -251,14 +243,10 @@ func TestRepoFork_outside_survey_no(t *testing.T) {
 
 	eq(t, cmdRun, false)
 
-	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Created fork someone/REPO`),
-	}
-	for _, r := range expectedLines {
-		if !r.MatchString(output.String()) {
-			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
-			return
-		}
+	r := regexp.MustCompile(`Created fork someone/REPO`)
+	if !r.MatchString(output.String()) {
+		t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+		return
 	}
 }
 
@@ -339,14 +327,10 @@ func TestRepoFork_in_parent_survey_no(t *testing.T) {
 
 	eq(t, cmdRun, false)
 
-	expectedLines := []*regexp.Regexp{
-		regexp.MustCompile(`Created fork someone/REPO`),
-	}
-	for _, r := range expectedLines {
-		if !r.MatchString(output.String()) {
-			t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
-			return
-		}
+	r := regexp.MustCompile(`Created fork someone/REPO`)
+	if !r.MatchString(output.String()) {
+		t.Errorf("output did not match regexp /%s/\n> output\n%s\n", r, output)
+		return
 	}
 }
 

From ce8f3418ebf849603f1b075e7acf2080061b0afc Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 2 Mar 2020 14:41:51 -0600
Subject: [PATCH 23/41] remove short versions of repo/clone to reduce usage
 clutter

---
 command/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index b76e88e64..26131a6fc 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -22,8 +22,8 @@ func init() {
 	repoCmd.AddCommand(repoViewCmd)
 	repoCmd.AddCommand(repoForkCmd)
 
-	repoForkCmd.Flags().StringP("clone", "c", "prompt", "Clone fork. Pass false to not clone fork.")
-	repoForkCmd.Flags().StringP("remote", "r", "prompt", "Add remote for fork. Pass false to not add remote.")
+	repoForkCmd.Flags().String("clone", "prompt", "Clone fork. Pass false to not clone fork.")
+	repoForkCmd.Flags().String("remote", "prompt", "Add remote for fork. Pass false to not add remote.")
 	repoForkCmd.Flags().Lookup("clone").NoOptDefVal = "true"
 	repoForkCmd.Flags().Lookup("remote").NoOptDefVal = "true"
 }

From cc9f58afee5d939389329e2f40ff1345e5f86022 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 2 Mar 2020 16:04:47 -0600
Subject: [PATCH 24/41] upon release move Pending Release project cards into
 Done column

---
 .github/workflows/releases.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index f241dc1d9..6cfa339c6 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -26,6 +26,22 @@ jobs:
           args: release --release-notes=CHANGELOG.md
         env:
           GITHUB_TOKEN: ${{secrets.UPLOAD_GITHUB_TOKEN}}
+  cards:
+    needs: goreleaser
+    runs-on: ubuntu-latest
+    if: ${!contains(github.ref, "-")}
+    env:
+      GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      HUB: 'bin/hub api -HACCEPT:application/vnd.github.inertia-preview+json '
+      PENDING_COLUMN: 8189733
+      DONE_COLUMN: 7110130
+    steps:
+      - name: move cards
+        shell: bash
+        run: |
+          curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
+          cards=$($HUB projects/columns/$PENDING_COLUMN/cards | jq "map(.id)|.[]")
+          for card in $cards; do $HUB projects/columns/cards/$card/moves --field position=top --field column_id=$DONE_COLUMN; done
   msi:
     needs: goreleaser
     runs-on: windows-latest

From 6b286072ddd49f5d6db6ab01e80c209112f811e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 18:12:30 +0100
Subject: [PATCH 25/41] Bump dependencies

---
 go.mod | 13 ++++++-------
 go.sum | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/go.mod b/go.mod
index 458a7268e..801583ef0 100644
--- a/go.mod
+++ b/go.mod
@@ -3,28 +3,27 @@ module github.com/cli/cli
 go 1.13
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.0.5
+	github.com/AlecAivazis/survey/v2 v2.0.7
 	github.com/alecthomas/chroma v0.7.1 // indirect
 	github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-version v1.2.0
-	github.com/henvic/httpretty v0.0.3
+	github.com/henvic/httpretty v0.0.4
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/mattn/go-colorable v0.1.4
+	github.com/mattn/go-colorable v0.1.6
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mattn/go-runewidth v0.0.8 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/muesli/reflow v0.0.0-20200210202703-cf7e7eac5cb4 // indirect
+	github.com/muesli/reflow v0.1.0 // indirect
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0 // indirect
-	github.com/yuin/goldmark v1.1.23 // indirect
+	github.com/yuin/goldmark v1.1.24 // indirect
 	golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4
 	golang.org/x/net v0.0.0-20200219183655-46282727080f // indirect
-	golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
-	golang.org/x/text v0.3.0
+	golang.org/x/text v0.3.2
 	gopkg.in/yaml.v2 v2.2.8 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71
 )
diff --git a/go.sum b/go.sum
index 518f745aa..02718dcfe 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/AlecAivazis/survey/v2 v2.0.5 h1:xpZp+Q55wi5C7Iaze+40onHnEkex1jSc34CltJjOoPM=
-github.com/AlecAivazis/survey/v2 v2.0.5/go.mod h1:WYBhg6f0y/fNYUuesWQc0PKbJcEliGcYHB9sNT3Bg74=
+github.com/AlecAivazis/survey/v2 v2.0.7 h1:+f825XHLse/hWd2tE/V5df04WFGimk34Eyg/z35w/rc=
+github.com/AlecAivazis/survey/v2 v2.0.7/go.mod h1:mlizQTaPjnR4jcpwRSaSlkbsRfYFEyKgLQvYTzxxiHA=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
@@ -80,8 +80,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/henvic/httpretty v0.0.3 h1:oHTreVv2lcdRYUNm4h3cgbrGN0dTieO9H8UnxEZNlvw=
-github.com/henvic/httpretty v0.0.3/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo=
+github.com/henvic/httpretty v0.0.4 h1:hyMkO0HugjsmWu63Z+7chDw7+RilkKBJ1vCwlqUOvOk=
+github.com/henvic/httpretty v0.0.4/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
@@ -108,8 +108,8 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
@@ -127,8 +127,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/muesli/reflow v0.0.0-20200210123334-eb23c6404749/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I=
-github.com/muesli/reflow v0.0.0-20200210202703-cf7e7eac5cb4 h1:IQAzML2A961stVPyK3En5VajxyiujmTEUkJUXsXHY44=
-github.com/muesli/reflow v0.0.0-20200210202703-cf7e7eac5cb4/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I=
+github.com/muesli/reflow v0.1.0 h1:oQdpLfO56lr5pgLvqD0TcjW85rDjSYSBVdiG1Ch1ddM=
+github.com/muesli/reflow v0.1.0/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I=
 github.com/muesli/termenv v0.4.0 h1:8Bz8WDF/6OoL7QENtESkAl3TlMyQq6+c3bjtJO3y9V8=
 github.com/muesli/termenv v0.4.0/go.mod h1:O1/I6sw+6KcrgAmcs6uiUVr7Lui+DNVbHTzt9Lm/PlI=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -186,8 +186,8 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.23 h1:eTodJ8hwEUvwXhb9qxQNuL/q1d+xMQClrXR4mdvV7gs=
-github.com/yuin/goldmark v1.1.23/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.24 h1:K4FemPDr4x/ZcqldoXWnexTLfdMIy2eEfXxsLnotTRI=
+github.com/yuin/goldmark v1.1.24/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -223,12 +223,15 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c h1:jceGD5YNJGgGMkJz79agzOln1K9TaZUjv5ird16qniQ=
-golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

From 371d4f5c6ada1792ab3019b69585a908885ce1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 20:05:44 +0100
Subject: [PATCH 26/41] Ensure that `gh <command> -h` is equivalent to `--help`

This compensates for what appears to be a bug in Cobra, which only
handles `pflag.ErrHelp` unless the error is wrapped. It also might be
that Cobra doesn't recognize Go 1.13-style error wrapping.
---
 command/root.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/command/root.go b/command/root.go
index d61799ddc..13dc04209 100644
--- a/command/root.go
+++ b/command/root.go
@@ -14,6 +14,7 @@ import (
 	"github.com/cli/cli/utils"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 // Version is dynamically set by the toolchain or overriden by the Makefile.
@@ -47,6 +48,9 @@ func init() {
 	// RootCmd.PersistentFlags().BoolP("verbose", "V", false, "enable verbose output")
 
 	RootCmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error {
+		if err == pflag.ErrHelp {
+			return err
+		}
 		return &FlagError{Err: err}
 	})
 }

From 8deb0d8783f8e188937a7a325eaff2846ad19a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 21:07:51 +0100
Subject: [PATCH 27/41] `repo create NAME` offers to set up when ran outside of
 a git repo

---
 api/queries_repo.go |  2 ++
 command/repo.go     | 79 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/api/queries_repo.go b/api/queries_repo.go
index 56959e86a..4793f7595 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -246,6 +246,8 @@ func RepoCreate(client *Client, input RepoCreateInput) (*Repository, error) {
 		createRepository(input: $input) {
 			repository {
 				id
+				name
+				owner { login }
 				url
 			}
 		}
diff --git a/command/repo.go b/command/repo.go
index 40e3847fb..82198ca49 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -6,6 +6,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/cli/cli/api"
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/internal/ghrepo"
@@ -79,15 +80,16 @@ func repoClone(cmd *cobra.Command, args []string) error {
 }
 
 func repoCreate(cmd *cobra.Command, args []string) error {
+	projectDir, projectDirErr := git.ToplevelDir()
+
 	var name string
 	if len(args) > 0 {
 		name = args[0]
 	} else {
-		dir, err := git.ToplevelDir()
-		if err != nil {
-			return err
+		if projectDirErr != nil {
+			return projectDirErr
 		}
-		name = path.Base(dir)
+		name = path.Base(projectDir)
 	}
 
 	isPublic, err := cmd.Flags().GetBool("public")
@@ -137,15 +139,70 @@ func repoCreate(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	remoteAdd := git.GitCommand("remote", "add", "origin", repo.URL+".git")
-	remoteAdd.Stdout = os.Stdout
-	remoteAdd.Stderr = os.Stderr
-	err = utils.PrepareCmd(remoteAdd).Run()
-	if err != nil {
-		return err
+	out := cmd.OutOrStdout()
+	greenCheck := utils.Green("✓")
+	isTTY := false
+	if outFile, isFile := out.(*os.File); isFile {
+		isTTY = utils.IsTerminal(outFile)
+		if isTTY {
+			// FIXME: duplicates colorableOut
+			out = utils.NewColorable(outFile)
+		}
+	}
+
+	if isTTY {
+		fmt.Fprintf(out, "%s Created repository %s on GitHub\n", greenCheck, ghrepo.FullName(repo))
+	} else {
+		fmt.Fprintln(out, repo.URL)
+	}
+
+	remoteURL := repo.URL + ".git"
+
+	if projectDirErr == nil {
+		// TODO: use git.AddRemote
+		remoteAdd := git.GitCommand("remote", "add", "origin", remoteURL)
+		remoteAdd.Stdout = os.Stdout
+		remoteAdd.Stderr = os.Stderr
+		err = utils.PrepareCmd(remoteAdd).Run()
+		if err != nil {
+			return err
+		}
+		if isTTY {
+			fmt.Fprintf(out, "%s Added remote %s\n", greenCheck, remoteURL)
+		}
+	} else if isTTY {
+		doSetup := false
+		// TODO: use overridable Confirm
+		err := survey.AskOne(&survey.Confirm{
+			Message: fmt.Sprintf("Create a local project directory for %s?", ghrepo.FullName(repo)),
+			Default: true,
+		}, &doSetup)
+		if err != nil {
+			return err
+		}
+
+		if doSetup {
+			path := repo.Name
+
+			gitInit := git.GitCommand("init", path)
+			gitInit.Stdout = os.Stdout
+			gitInit.Stderr = os.Stderr
+			err = utils.PrepareCmd(gitInit).Run()
+			if err != nil {
+				return err
+			}
+			gitRemoteAdd := git.GitCommand("-C", path, "remote", "add", "origin", remoteURL)
+			gitRemoteAdd.Stdout = os.Stdout
+			gitRemoteAdd.Stderr = os.Stderr
+			err = utils.PrepareCmd(gitRemoteAdd).Run()
+			if err != nil {
+				return err
+			}
+
+			fmt.Fprintf(out, "%s Initialized repository in './%s/'\n", greenCheck, path)
+		}
 	}
 
-	fmt.Fprintln(cmd.OutOrStdout(), repo.URL)
 	return nil
 }
 

From be09717918b4bef2fa3c504bd61d940150784633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 21:49:47 +0100
Subject: [PATCH 28/41] Add ability to `repo create` within an org

---
 api/queries_org.go   |  24 ++++++++
 api/queries_repo.go  |  18 ++++++
 command/repo.go      |  20 ++++++-
 command/repo_test.go | 136 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 api/queries_org.go

diff --git a/api/queries_org.go b/api/queries_org.go
new file mode 100644
index 000000000..21d1f528c
--- /dev/null
+++ b/api/queries_org.go
@@ -0,0 +1,24 @@
+package api
+
+import "fmt"
+
+// using API v3 here because the equivalent in GraphQL needs `read:org` scope
+func resolveOrganization(client *Client, orgName string) (string, error) {
+	var response struct {
+		NodeID string `json:"node_id"`
+	}
+	err := client.REST("GET", fmt.Sprintf("users/%s", orgName), nil, &response)
+	return response.NodeID, err
+}
+
+// using API v3 here because the equivalent in GraphQL needs `read:org` scope
+func resolveOrganizationTeam(client *Client, orgName, teamSlug string) (string, string, error) {
+	var response struct {
+		NodeID       string `json:"node_id"`
+		Organization struct {
+			NodeID string `json:"node_id"`
+		}
+	}
+	err := client.REST("GET", fmt.Sprintf("orgs/%s/teams/%s", orgName, teamSlug), nil, &response)
+	return response.Organization.NodeID, response.NodeID, err
+}
diff --git a/api/queries_repo.go b/api/queries_repo.go
index 4793f7595..ce371f656 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -225,6 +225,9 @@ type RepoCreateInput struct {
 	Homepage    string `json:"homepage,omitempty"`
 	Description string `json:"description,omitempty"`
 
+	OwnerID string `json:"ownerId,omitempty"`
+	TeamID  string `json:"teamId,omitempty"`
+
 	HasIssuesEnabled bool `json:"hasIssuesEnabled"`
 	HasWikiEnabled   bool `json:"hasWikiEnabled"`
 }
@@ -237,6 +240,21 @@ func RepoCreate(client *Client, input RepoCreateInput) (*Repository, error) {
 		}
 	}
 
+	if input.TeamID != "" {
+		orgID, teamID, err := resolveOrganizationTeam(client, input.OwnerID, input.TeamID)
+		if err != nil {
+			return nil, err
+		}
+		input.TeamID = teamID
+		input.OwnerID = orgID
+	} else if input.OwnerID != "" {
+		orgID, err := resolveOrganization(client, input.OwnerID)
+		if err != nil {
+			return nil, err
+		}
+		input.OwnerID = orgID
+	}
+
 	variables := map[string]interface{}{
 		"input": input,
 	}
diff --git a/command/repo.go b/command/repo.go
index 82198ca49..4464b898f 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -20,6 +20,7 @@ func init() {
 	repoCmd.AddCommand(repoCreateCmd)
 	repoCreateCmd.Flags().StringP("description", "d", "", "Description of repository")
 	repoCreateCmd.Flags().StringP("homepage", "h", "", "Repository home page URL")
+	repoCreateCmd.Flags().StringP("team", "t", "", "The name of the organization team to be granted access")
 	repoCreateCmd.Flags().Bool("enable-issues", true, "Enable issues in the new repository")
 	repoCreateCmd.Flags().Bool("enable-wiki", true, "Enable wiki in the new repository")
 	repoCreateCmd.Flags().Bool("public", false, "Make the new repository public")
@@ -49,8 +50,10 @@ To pass 'git clone' options, separate them with '--'.`,
 var repoCreateCmd = &cobra.Command{
 	Use:   "create [<name>]",
 	Short: "Create a new repository",
-	Long:  `Create a new GitHub repository.`,
-	RunE:  repoCreate,
+	Long: `Create a new GitHub repository.
+
+Use the "ORG/NAME" syntax to create a repository within your organization.`,
+	RunE: repoCreate,
 }
 
 var repoViewCmd = &cobra.Command{
@@ -82,9 +85,20 @@ func repoClone(cmd *cobra.Command, args []string) error {
 func repoCreate(cmd *cobra.Command, args []string) error {
 	projectDir, projectDirErr := git.ToplevelDir()
 
+	orgName := ""
+	teamSlug, err := cmd.Flags().GetString("team")
+	if err != nil {
+		return err
+	}
+
 	var name string
 	if len(args) > 0 {
 		name = args[0]
+		if strings.Contains(name, "/") {
+			newRepo := ghrepo.FromFullName(name)
+			orgName = newRepo.RepoOwner()
+			name = newRepo.RepoName()
+		}
 	} else {
 		if projectDirErr != nil {
 			return projectDirErr
@@ -122,6 +136,8 @@ func repoCreate(cmd *cobra.Command, args []string) error {
 	input := api.RepoCreateInput{
 		Name:             name,
 		Visibility:       visibility,
+		OwnerID:          orgName,
+		TeamID:           teamSlug,
 		Description:      description,
 		Homepage:         homepage,
 		HasIssuesEnabled: hasIssuesEnabled,
diff --git a/command/repo_test.go b/command/repo_test.go
index 82cae32c7..d55af31c3 100644
--- a/command/repo_test.go
+++ b/command/repo_test.go
@@ -108,6 +108,10 @@ func TestRepoCreate(t *testing.T) {
 		}
 	}
 
+	if len(http.Requests) != 1 {
+		t.Fatalf("expected 1 HTTP request, got %d", len(http.Requests))
+	}
+
 	bodyBytes, _ := ioutil.ReadAll(http.Requests[0].Body)
 	json.Unmarshal(bodyBytes, &reqBody)
 	if repoName := reqBody.Variables.Input["name"].(string); repoName != "REPO" {
@@ -116,6 +120,138 @@ func TestRepoCreate(t *testing.T) {
 	if repoVisibility := reqBody.Variables.Input["visibility"].(string); repoVisibility != "PRIVATE" {
 		t.Errorf("expected %q, got %q", "PRIVATE", repoVisibility)
 	}
+	if _, ownerSet := reqBody.Variables.Input["ownerId"]; ownerSet {
+		t.Error("expected ownerId not to be set")
+	}
+}
+
+func TestRepoCreate_org(t *testing.T) {
+	ctx := context.NewBlank()
+	ctx.SetBranch("master")
+	initContext = func() context.Context {
+		return ctx
+	}
+
+	http := initFakeHTTP()
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "node_id": "ORGID"
+	}
+	`))
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "data": { "createRepository": {
+		"repository": {
+			"id": "REPOID",
+			"url": "https://github.com/ORG/REPO"
+		}
+	} } }
+	`))
+
+	var seenCmd *exec.Cmd
+	restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmd = cmd
+		return &outputStub{}
+	})
+	defer restoreCmd()
+
+	output, err := RunCommand(repoCreateCmd, "repo create ORG/REPO")
+	if err != nil {
+		t.Errorf("error running command `repo create`: %v", err)
+	}
+
+	eq(t, output.String(), "https://github.com/ORG/REPO\n")
+	eq(t, output.Stderr(), "")
+
+	if seenCmd == nil {
+		t.Fatal("expected a command to run")
+	}
+	eq(t, strings.Join(seenCmd.Args, " "), "git remote add origin https://github.com/ORG/REPO.git")
+
+	var reqBody struct {
+		Query     string
+		Variables struct {
+			Input map[string]interface{}
+		}
+	}
+
+	if len(http.Requests) != 2 {
+		t.Fatalf("expected 2 HTTP requests, got %d", len(http.Requests))
+	}
+
+	eq(t, http.Requests[0].URL.Path, "/users/ORG")
+
+	bodyBytes, _ := ioutil.ReadAll(http.Requests[1].Body)
+	json.Unmarshal(bodyBytes, &reqBody)
+	if orgID := reqBody.Variables.Input["ownerId"].(string); orgID != "ORGID" {
+		t.Errorf("expected %q, got %q", "ORGID", orgID)
+	}
+	if _, teamSet := reqBody.Variables.Input["teamId"]; teamSet {
+		t.Error("expected teamId not to be set")
+	}
+}
+
+func TestRepoCreate_orgWithTeam(t *testing.T) {
+	ctx := context.NewBlank()
+	ctx.SetBranch("master")
+	initContext = func() context.Context {
+		return ctx
+	}
+
+	http := initFakeHTTP()
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "node_id": "TEAMID",
+	  "organization": { "node_id": "ORGID" }
+	}
+	`))
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "data": { "createRepository": {
+		"repository": {
+			"id": "REPOID",
+			"url": "https://github.com/ORG/REPO"
+		}
+	} } }
+	`))
+
+	var seenCmd *exec.Cmd
+	restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
+		seenCmd = cmd
+		return &outputStub{}
+	})
+	defer restoreCmd()
+
+	output, err := RunCommand(repoCreateCmd, "repo create ORG/REPO --team monkeys")
+	if err != nil {
+		t.Errorf("error running command `repo create`: %v", err)
+	}
+
+	eq(t, output.String(), "https://github.com/ORG/REPO\n")
+	eq(t, output.Stderr(), "")
+
+	if seenCmd == nil {
+		t.Fatal("expected a command to run")
+	}
+	eq(t, strings.Join(seenCmd.Args, " "), "git remote add origin https://github.com/ORG/REPO.git")
+
+	var reqBody struct {
+		Query     string
+		Variables struct {
+			Input map[string]interface{}
+		}
+	}
+
+	if len(http.Requests) != 2 {
+		t.Fatalf("expected 2 HTTP requests, got %d", len(http.Requests))
+	}
+
+	eq(t, http.Requests[0].URL.Path, "/orgs/ORG/teams/monkeys")
+
+	bodyBytes, _ := ioutil.ReadAll(http.Requests[1].Body)
+	json.Unmarshal(bodyBytes, &reqBody)
+	if orgID := reqBody.Variables.Input["ownerId"].(string); orgID != "ORGID" {
+		t.Errorf("expected %q, got %q", "ORGID", orgID)
+	}
+	if teamID := reqBody.Variables.Input["teamId"].(string); teamID != "TEAMID" {
+		t.Errorf("expected %q, got %q", "TEAMID", teamID)
+	}
 }
 
 func TestRepoView(t *testing.T) {

From 90d2f99d2a5f37bc6458200297ff91ba16f12b8c Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 3 Mar 2020 15:38:05 -0600
Subject: [PATCH 29/41] this fetch was redundant since AddRemote fetches

---
 command/repo.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 26131a6fc..49c39db8a 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -195,15 +195,6 @@ func repoFork(cmd *cobra.Command, args []string) error {
 				return fmt.Errorf("failed to add remote: %w", err)
 			}
 
-			fetchCmd := git.GitCommand("fetch", "fork")
-			fetchCmd.Stdin = os.Stdin
-			fetchCmd.Stdout = os.Stdout
-			fetchCmd.Stderr = os.Stderr
-			err = utils.PrepareCmd(fetchCmd).Run()
-			if err != nil {
-				return fmt.Errorf("failed to fetch new remote: %w", err)
-			}
-
 			fmt.Fprintf(out, "%s Remote added at %s\n", greenCheck, utils.Bold("fork"))
 		}
 	} else {

From 44c0d115fc4c28043323d66bac65e54294f56730 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 3 Mar 2020 15:40:19 -0600
Subject: [PATCH 30/41] usage

---
 command/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 49c39db8a..031c3690d 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -22,8 +22,8 @@ func init() {
 	repoCmd.AddCommand(repoViewCmd)
 	repoCmd.AddCommand(repoForkCmd)
 
-	repoForkCmd.Flags().String("clone", "prompt", "Clone fork. Pass false to not clone fork.")
-	repoForkCmd.Flags().String("remote", "prompt", "Add remote for fork. Pass false to not add remote.")
+	repoForkCmd.Flags().String("clone", "prompt", "Clone fork: {true|false|prompt}")
+	repoForkCmd.Flags().String("remote", "prompt", "Add remote for fork. {true|false|prompt}")
 	repoForkCmd.Flags().Lookup("clone").NoOptDefVal = "true"
 	repoForkCmd.Flags().Lookup("remote").NoOptDefVal = "true"
 }

From 11424e0ed09ce8e0d98a3e728584ce3f9efd2581 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 3 Mar 2020 15:46:32 -0600
Subject: [PATCH 31/41] step not job

---
 .github/workflows/releases.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 6cfa339c6..009fc0b1e 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -26,17 +26,13 @@ jobs:
           args: release --release-notes=CHANGELOG.md
         env:
           GITHUB_TOKEN: ${{secrets.UPLOAD_GITHUB_TOKEN}}
-  cards:
-    needs: goreleaser
-    runs-on: ubuntu-latest
-    if: ${!contains(github.ref, "-")}
-    env:
-      GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      HUB: 'bin/hub api -HACCEPT:application/vnd.github.inertia-preview+json '
-      PENDING_COLUMN: 8189733
-      DONE_COLUMN: 7110130
-    steps:
       - name: move cards
+        if: ${!contains(github.ref, "-")}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          HUB: 'bin/hub api -HACCEPT:application/vnd.github.inertia-preview+json '
+          PENDING_COLUMN: 8189733
+          DONE_COLUMN: 7110130
         shell: bash
         run: |
           curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1

From 17e690e093c1c70af1d3dfc1f5a5550010317b09 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 3 Mar 2020 15:48:31 -0600
Subject: [PATCH 32/41] hopefully fix if

---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 009fc0b1e..fa8da81c1 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -27,7 +27,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.UPLOAD_GITHUB_TOKEN}}
       - name: move cards
-        if: ${!contains(github.ref, "-")}
+        if: "!contains(github.ref, '-')"
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           HUB: 'bin/hub api -HACCEPT:application/vnd.github.inertia-preview+json '

From 26c799e2ea48778df1882263b447d30ac401f9e0 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Tue, 3 Mar 2020 15:52:26 -0600
Subject: [PATCH 33/41] use function not env var

---
 .github/workflows/releases.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index fa8da81c1..e94b6a26c 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -30,14 +30,14 @@ jobs:
         if: "!contains(github.ref, '-')"
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          HUB: 'bin/hub api -HACCEPT:application/vnd.github.inertia-preview+json '
           PENDING_COLUMN: 8189733
           DONE_COLUMN: 7110130
         shell: bash
         run: |
           curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
-          cards=$($HUB projects/columns/$PENDING_COLUMN/cards | jq "map(.id)|.[]")
-          for card in $cards; do $HUB projects/columns/cards/$card/moves --field position=top --field column_id=$DONE_COLUMN; done
+          api() { bin/hub api -H 'accept: application/vnd.github.inertia-preview+json' "$@"; }
+          cards=$(api projects/columns/$PENDING_COLUMN/cards | jq ".[].id")
+          for card in $cards; do api projects/columns/cards/$card/moves --field position=top --field column_id=$DONE_COLUMN; done
   msi:
     needs: goreleaser
     runs-on: windows-latest

From 15b758aaa9eda6e795f8593b0c51b3f77d4a9173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 22:59:35 +0100
Subject: [PATCH 34/41] Tweak `repo` docs

---
 command/repo.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 1a8dd28d9..2afe35831 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -19,6 +19,7 @@ import (
 func init() {
 	RootCmd.AddCommand(repoCmd)
 	repoCmd.AddCommand(repoCloneCmd)
+
 	repoCmd.AddCommand(repoCreateCmd)
 	repoCreateCmd.Flags().StringP("description", "d", "", "Description of repository")
 	repoCreateCmd.Flags().StringP("homepage", "h", "", "Repository home page URL")
@@ -26,13 +27,14 @@ func init() {
 	repoCreateCmd.Flags().Bool("enable-issues", true, "Enable issues in the new repository")
 	repoCreateCmd.Flags().Bool("enable-wiki", true, "Enable wiki in the new repository")
 	repoCreateCmd.Flags().Bool("public", false, "Make the new repository public")
-	repoCmd.AddCommand(repoViewCmd)
-	repoCmd.AddCommand(repoForkCmd)
 
+	repoCmd.AddCommand(repoForkCmd)
 	repoForkCmd.Flags().String("clone", "prompt", "Clone fork: {true|false|prompt}")
-	repoForkCmd.Flags().String("remote", "prompt", "Add remote for fork. {true|false|prompt}")
+	repoForkCmd.Flags().String("remote", "prompt", "Add remote for fork: {true|false|prompt}")
 	repoForkCmd.Flags().Lookup("clone").NoOptDefVal = "true"
 	repoForkCmd.Flags().Lookup("remote").NoOptDefVal = "true"
+
+	repoCmd.AddCommand(repoViewCmd)
 }
 
 var repoCmd = &cobra.Command{

From 74cd5b383736c3a8d3d1b29409249aa4807624f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 22:59:50 +0100
Subject: [PATCH 35/41] Use overridable `Confirm`

---
 command/repo.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 2afe35831..29739c568 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -207,11 +207,7 @@ func repoCreate(cmd *cobra.Command, args []string) error {
 		}
 	} else if isTTY {
 		doSetup := false
-		// TODO: use overridable Confirm
-		err := survey.AskOne(&survey.Confirm{
-			Message: fmt.Sprintf("Create a local project directory for %s?", ghrepo.FullName(repo)),
-			Default: true,
-		}, &doSetup)
+		err := Confirm(fmt.Sprintf("Create a local project directory for %s?", ghrepo.FullName(repo)), &doSetup)
 		if err != nil {
 			return err
 		}

From 030538871d8c797fc9aeb3afd9b4e96fa461a832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 3 Mar 2020 23:34:32 +0100
Subject: [PATCH 36/41] Fix `make site-docs`

---
 Makefile             | 3 +--
 cmd/gen-docs/main.go | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b8aba5ea..5a93dac9b 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ test:
 .PHONY: test
 
 site:
-	git worktree add site gh-pages
+	git clone https://github.com/github/cli.github.com.git "$@"
 
 site-docs: site
 	git -C site pull
@@ -33,5 +33,4 @@ site-docs: site
 	rm -f site/manual/*.bak
 	git -C site add 'manual/gh*.md'
 	git -C site commit -m 'update help docs'
-	git -C site push
 .PHONY: site-docs
diff --git a/cmd/gen-docs/main.go b/cmd/gen-docs/main.go
index 5369d9670..6607054a9 100644
--- a/cmd/gen-docs/main.go
+++ b/cmd/gen-docs/main.go
@@ -28,7 +28,7 @@ func main() {
 
 func filePrepender(filename string) string {
 	return `---
-layout: page
+layout: manual
 permalink: /:path/:basename
 ---
 

From d3013595f0c4bcf4854c6035f5cff62d31b25672 Mon Sep 17 00:00:00 2001
From: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
Date: Tue, 3 Mar 2020 15:35:10 -0700
Subject: [PATCH 37/41] Add usage to README for repos

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c98b207d0..d731a3cb6 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ And if you spot bugs or have features that you'd really like to see in `gh`, ple
 
 - `gh pr [status, list, view, checkout, create]`
 - `gh issue [status, list, view, create]`
+- `gh repo [view, create, clone, fork]`
 - `gh help`
 
 Check out the [docs][] for more information.

From be32459de161c41f53e4e061cb37e78ca97039ce Mon Sep 17 00:00:00 2001
From: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
Date: Tue, 3 Mar 2020 15:38:50 -0700
Subject: [PATCH 38/41] Update repo usage

---
 command/repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/repo.go b/command/repo.go
index 29739c568..97aecf8db 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -39,7 +39,7 @@ func init() {
 
 var repoCmd = &cobra.Command{
 	Use:   "repo",
-	Short: "View repositories",
+	Short: "Create, clone, fork, and view repositories",
 	Long: `Work with GitHub repositories.
 
 A repository can be supplied as an argument in any of the following formats:

From 0d6e34715560a904bd7de5bc7bed48c0fc23dfa5 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 4 Mar 2020 15:03:04 +0100
Subject: [PATCH 39/41] Bump glamour dependency

This indirectly also updates the chroma syntax highlighting package,
which fixes a rendering bug for CRLF line endings, which we
encountered in cli. We can therefore remove our internal work-around.
---
 go.mod         |  5 +----
 go.sum         | 26 ++++----------------------
 utils/utils.go |  9 +--------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/go.mod b/go.mod
index f185961b9..63a39c1bf 100644
--- a/go.mod
+++ b/go.mod
@@ -4,9 +4,8 @@ go 1.13
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.0.7
-	github.com/alecthomas/chroma v0.7.1 // indirect
 	github.com/briandowns/spinner v1.9.0
-	github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8
+	github.com/charmbracelet/glamour v0.1.1-0.20200304134224-7e5c90143acc
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-version v1.2.0
@@ -17,11 +16,9 @@ require (
 	github.com/mattn/go-runewidth v0.0.8 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/muesli/reflow v0.1.0 // indirect
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0 // indirect
-	github.com/yuin/goldmark v1.1.24 // indirect
 	golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4
 	golang.org/x/net v0.0.0-20200219183655-46282727080f // indirect
 	golang.org/x/text v0.3.2
diff --git a/go.sum b/go.sum
index 31d3b9d83..8d7665e96 100644
--- a/go.sum
+++ b/go.sum
@@ -3,23 +3,16 @@ github.com/AlecAivazis/survey/v2 v2.0.7 h1:+f825XHLse/hWd2tE/V5df04WFGimk34Eyg/z
 github.com/AlecAivazis/survey/v2 v2.0.7/go.mod h1:mlizQTaPjnR4jcpwRSaSlkbsRfYFEyKgLQvYTzxxiHA=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
-github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
-github.com/alecthomas/chroma v0.7.0 h1:z+0HgTUmkpRDRz0SRSdMaqOLfJV4F+N1FPDZUZIDUzw=
-github.com/alecthomas/chroma v0.7.0/go.mod h1:1U/PfCsTALWWYHDnsIQkxEBM0+6LLe0v8+RSVMOwxeY=
-github.com/alecthomas/chroma v0.7.1 h1:G1i02OhUbRi2nJxcNkwJaY/J1gHXj9tt72qN6ZouLFQ=
-github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc=
+github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5 h1:yt5ij+XTe1QL+TpFj7i547enM5YuGKp9nZ/WvOoqcsQ=
+github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod h1:fv5SzZPFJbwp2NXJWpFIX7DZS4HgV1K4ew4Pc2OZD9s=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
-github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
-github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
 github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY=
 github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -30,8 +23,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/briandowns/spinner v1.9.0 h1:+OMAisemaHar1hjuJ3Z2hIvNhQl9Y7GLPWUwwz2Pxo8=
 github.com/briandowns/spinner v1.9.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8 h1:udjWAc2bbIP0LyzEMt7BWxk6O6lIoONWoonN3C9bMtA=
-github.com/charmbracelet/glamour v0.1.1-0.20200210132808-8d4e3f0692f8/go.mod h1:UsY1vFbaLp/j/SYgLfPH0n2I0jngBL+q6+mCAsESih4=
+github.com/charmbracelet/glamour v0.1.1-0.20200304134224-7e5c90143acc h1:WSZ06evYgfSZYqkcv0+jFVSVCJeYsIvU+J4ILZUrha4=
+github.com/charmbracelet/glamour v0.1.1-0.20200304134224-7e5c90143acc/go.mod h1:sC1EP6T+3nFnl5vwf0TYEs1inMigQxZ7n912YKoxJow=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -40,7 +33,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -73,10 +65,6 @@ github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f h1:5CjVwnuUcp5adK4gm
 github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
-github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -90,7 +78,6 @@ github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDG
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -130,13 +117,11 @@ github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/le
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/muesli/reflow v0.0.0-20200210123334-eb23c6404749/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I=
 github.com/muesli/reflow v0.1.0 h1:oQdpLfO56lr5pgLvqD0TcjW85rDjSYSBVdiG1Ch1ddM=
 github.com/muesli/reflow v0.1.0/go.mod h1:I9bWAt7QTg/que/qmUCJBGlj7wEq8OAFBjPNjc6xK4I=
 github.com/muesli/termenv v0.4.0 h1:8Bz8WDF/6OoL7QENtESkAl3TlMyQq6+c3bjtJO3y9V8=
 github.com/muesli/termenv v0.4.0/go.mod h1:O1/I6sw+6KcrgAmcs6uiUVr7Lui+DNVbHTzt9Lm/PlI=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -185,11 +170,8 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.1.22/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.24 h1:K4FemPDr4x/ZcqldoXWnexTLfdMIy2eEfXxsLnotTRI=
 github.com/yuin/goldmark v1.1.24/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
diff --git a/utils/utils.go b/utils/utils.go
index fe7bcd4f7..065c4988e 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/briandowns/spinner"
@@ -19,14 +18,8 @@ func OpenInBrowser(url string) error {
 	return PrepareCmd(browseCmd).Run()
 }
 
-func normalizeNewlines(s string) string {
-	s = strings.Replace(s, "\r\n", "\n", -1)
-	s = strings.Replace(s, "\r", "\n", -1)
-	return s
-}
-
 func RenderMarkdown(text string) (string, error) {
-	return glamour.Render(normalizeNewlines(text), "dark")
+	return glamour.Render(text, "dark")
 }
 
 func Pluralize(num int, thing string) string {

From fdfcecfcb6bb280316a8b6212f91c3326ac37575 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 4 Mar 2020 14:20:55 +0000
Subject: [PATCH 40/41] Fix typo in 'overridden'

---
 command/root.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/root.go b/command/root.go
index 13dc04209..7b0d078ef 100644
--- a/command/root.go
+++ b/command/root.go
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/pflag"
 )
 
-// Version is dynamically set by the toolchain or overriden by the Makefile.
+// Version is dynamically set by the toolchain or overridden by the Makefile.
 var Version = "DEV"
 
 // BuildDate is dynamically set at build time in the Makefile.

From f2262cfcae2ab9d66755820ec8205783f1180a0c Mon Sep 17 00:00:00 2001
From: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
Date: Wed, 4 Mar 2020 10:22:46 -0700
Subject: [PATCH 41/41] Consistent punctuation in usage

---
 command/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/repo.go b/command/repo.go
index 97aecf8db..53b2ca8f8 100644
--- a/command/repo.go
+++ b/command/repo.go
@@ -68,7 +68,7 @@ Use the "ORG/NAME" syntax to create a repository within your organization.`,
 
 var repoForkCmd = &cobra.Command{
 	Use:   "fork [<repository>]",
-	Short: "Create a fork of a repository.",
+	Short: "Create a fork of a repository",
 	Long: `Create a fork of a repository.
 
 With no argument, creates a fork of the current repository. Otherwise, forks the specified repository.`,
@@ -77,7 +77,7 @@ With no argument, creates a fork of the current repository. Otherwise, forks the
 
 var repoViewCmd = &cobra.Command{
 	Use:   "view [<repository>]",
-	Short: "View a repository in the browser.",
+	Short: "View a repository in the browser",
 	Long: `View a GitHub repository in the browser.
 
 With no argument, the repository for the current directory is opened.`,