Fallback clone from user organization

pkg/cmd/org/list/http.go

@@ -16,7 +16,7 @@ type Organization struct {
  Login string
 }
 
-func listOrgs(httpClient *http.Client, hostname string, limit int) (*OrganizationList, error) {
+func ListOrgs(httpClient *http.Client, hostname string, limit int) (*OrganizationList, error) {
  type response struct {
  User struct {
  Login string

pkg/cmd/org/list/list.go

@@ -69,7 +69,7 @@ func listRun(opts *ListOptions) error {
 
  host, _ := cfg.Authentication().DefaultHost()
 
- listResult, err := listOrgs(httpClient, host, opts.Limit)
+ listResult, err := ListOrgs(httpClient, host, opts.Limit)
  if err != nil {
  return err
  }

pkg/cmd/repo/clone/clone.go

@@ -12,6 +12,7 @@ import (
  "github.com/cli/cli/v2/git"
  "github.com/cli/cli/v2/internal/config"
  "github.com/cli/cli/v2/internal/ghrepo"
+ org "github.com/cli/cli/v2/pkg/cmd/org/list"
  "github.com/cli/cli/v2/pkg/cmdutil"
  "github.com/cli/cli/v2/pkg/iostreams"
  "github.com/spf13/cobra"
@@ -165,6 +166,12 @@ func cloneRun(opts *CloneOptions) error {
  // Load the repo from the API to get the username/repo name in its
  // canonical capitalization
  canonicalRepo, err := api.GitHubRepo(apiClient, repo)
+ if err != nil && repositoryIsFullName {
+ return err
+ }
+ // Try to find the repo in the user's organizations, since the user did not
+ // specify the owner.
+ canonicalRepo, err = repoFromUserOrgs(apiClient, repo)
  if err != nil {
  return err
  }
@@ -223,6 +230,25 @@ func cloneRun(opts *CloneOptions) error {
  return nil
 }
 
+const orgsQueryLimit = 5
+
+func repoFromUserOrgs(apiClient *api.Client, repo ghrepo.Interface) (*api.Repository, error) {
+ orgs, err := org.ListOrgs(apiClient.HTTP(), repo.RepoHost(), orgsQueryLimit)
+ if err != nil || orgs.TotalCount == 0 {
+ // Return the original error in the event that the fallback query fails.
+ return nil, err
+ }
+ var canonicalRepo *api.Repository
+ for _, org := range orgs.Organizations {
+ repo = ghrepo.NewWithHost(org.Login, repo.RepoName(), repo.RepoHost())
+ canonicalRepo, err = api.GitHubRepo(apiClient, repo)
+ if err == nil {
+ return canonicalRepo, nil
+ }
+ }
+ return nil, fmt.Errorf("'%s' repository not found", repo.RepoName())
+}
+
 // simplifyURL strips given URL of extra parts like extra path segments (i.e.,
 // anything beyond `/owner/repo`), query strings, or fragments. This function
 // never returns an error.