From 625b673b587095df7d985a06e5e5883559215687 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Mon, 22 Jun 2020 15:30:22 -0400 Subject: [PATCH] Ignore repo flag errors in determineBaseRepo --- command/root.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/command/root.go b/command/root.go index 3f83ba278..83dfbd3f0 100644 --- a/command/root.go +++ b/command/root.go @@ -303,8 +303,8 @@ 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) @@ -312,17 +312,12 @@ func determineBaseRepo(apiClient *api.Client, cmd *cobra.Command, ctx context.Co 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, repo) if err != nil { return nil, err }