use new toplevel gitmode argument

also moves a func around for smaller PR diff.

Signed-off-by: Spencer Schrock <sschrock@google.com>

clients/githubrepo/client.go

@@ -334,13 +334,6 @@ func CreateGithubRepoClientWithTransport(ctx context.Context, rt http.RoundTripp
 	return rc
 }
 
-// CreateGithubRepoClient returns a Client which implements RepoClient interface.
-func CreateGithubRepoClient(ctx context.Context, logger *log.Logger) clients.RepoClient {
-	// Use our custom roundtripper
-	rt := roundtripper.NewTransport(ctx, logger)
-	return CreateGithubRepoClientWithTransport(ctx, rt)
-}
-
 // NewRepoClient returns a Client which implements RepoClient interface.
 // It can be configured with various [Option]s.
 func NewRepoClient(ctx context.Context, opts ...Option) (clients.RepoClient, error) {
@@ -430,6 +423,13 @@ func NewRepoClient(ctx context.Context, opts ...Option) (clients.RepoClient, err
 	}, nil
 }
 
+// CreateGithubRepoClient returns a Client which implements RepoClient interface.
+func CreateGithubRepoClient(ctx context.Context, logger *log.Logger) clients.RepoClient {
+	// Use our custom roundtripper
+	rt := roundtripper.NewTransport(ctx, logger)
+	return CreateGithubRepoClientWithTransport(ctx, rt)
+}
+
 // CreateOssFuzzRepoClient returns a RepoClient implementation
 // initialized to `google/oss-fuzz` GitHub repository.
 //

cmd/root.go

@@ -155,12 +155,9 @@ func rootCmd(o *options.Options) error {
 		scorecard.WithChecks(checks),
 	}
 	if o.GitMode {
-		rc, err := githubrepo.NewRepoClient(ctx, githubrepo.WithGitMode())
-		if err != nil {
-			return fmt.Errorf("enabling github git mode: %w", err)
-		}
-		opts = append(opts, scorecard.WithRepoClient(rc))
+		opts = append(opts, scorecard.WithGitMode())
 	}
+
 	repoResult, err = scorecard.Run(ctx, repo, opts...)
 	if err != nil {
 		return fmt.Errorf("scorecard.Run: %w", err)