Merge pull request cli#1253 from cli/remove-global-repo-flag-for-real-this-time

mislav · web-flow · commit 6cc03d30ed9e · 2020-07-02T15:45:39.000+02:00
Remove the global repo flag
diff --git a/command/issue.go b/command/issue.go
@@ -22,6 +22,8 @@ import (
 )
 
 func init() {
+	issueCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `OWNER/REPO` format")
+
 	RootCmd.AddCommand(issueCmd)
 	issueCmd.AddCommand(issueStatusCmd)
 
diff --git a/command/pr.go b/command/pr.go
@@ -23,6 +23,8 @@ import (
 )
 
 func init() {
+	prCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `OWNER/REPO` format")
+
 	RootCmd.AddCommand(prCmd)
 	prCmd.AddCommand(prCheckoutCmd)
 	prCmd.AddCommand(prCreateCmd)
diff --git a/command/root.go b/command/root.go
@@ -52,7 +52,6 @@ func init() {
 	RootCmd.AddCommand(versionCmd)
 	RootCmd.SetVersionTemplate(versionOutput)
 
-	RootCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `OWNER/REPO` format")
 	RootCmd.PersistentFlags().Bool("help", false, "Show help for command")
 	RootCmd.Flags().Bool("version", false, "Show gh version")
 	// TODO:
@@ -304,26 +303,21 @@ func changelogURL(version string) string {
 }
 
 func determineBaseRepo(apiClient *api.Client, cmd *cobra.Command, ctx context.Context) (ghrepo.Interface, error) {
-	repo, err := cmd.Flags().GetString("repo")
-	if err == nil && repo != "" {
+	repo, _ := cmd.Flags().GetString("repo")
+	if repo != "" {
 		baseRepo, err := ghrepo.FromFullName(repo)
 		if err != nil {
 			return nil, fmt.Errorf("argument error: %w", err)
 		}
 		return baseRepo, nil
 	}
 
-	baseOverride, err := cmd.Flags().GetString("repo")
-	if err != nil {
-		return nil, err
-	}
-
 	remotes, err := ctx.Remotes()
 	if err != nil {
 		return nil, err
 	}
 
-	repoContext, err := context.ResolveRemotesToRepos(remotes, apiClient, baseOverride)
+	repoContext, err := context.ResolveRemotesToRepos(remotes, apiClient, "")
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ import (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func init() {`
	`25`	+ issueCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `OWNER/REPO` format")
	`26`	`+`
`25`	`27`	`RootCmd.AddCommand(issueCmd)`
`26`	`28`	`issueCmd.AddCommand(issueStatusCmd)`
`27`	`29`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func init() {`
	`26`	+ prCmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `OWNER/REPO` format")
	`27`	`+`
`26`	`28`	`RootCmd.AddCommand(prCmd)`
`27`	`29`	`prCmd.AddCommand(prCheckoutCmd)`
`28`	`30`	`prCmd.AddCommand(prCreateCmd)`