Merge branch 'main' into lift-depupdatetool

Author: azeemshaikh38

pkg/scorecard.go

@@ -66,8 +66,11 @@ func runEnabledChecks(ctx context.Context,
 
 func getRepoCommitHash(r clients.RepoClient) (string, error) {
 	commits, err := r.ListCommits()
-
-	if err != nil && !errors.Is(err, clients.ErrUnsupportedFeature) {
+	if err != nil {
+		// allow --local repos to still process
+		if errors.Is(err, clients.ErrUnsupportedFeature) {
+			return "unknown", nil
+		}
 		return "", sce.WithMessage(sce.ErrScorecardInternal, fmt.Sprintf("ListCommits:%v", err.Error()))
 	}
 

pkg/scorecard_test.go

@@ -21,7 +21,9 @@ import (
 	"github.com/golang/mock/gomock"
 
 	"github.com/ossf/scorecard/v4/clients"
+	"github.com/ossf/scorecard/v4/clients/localdir"
 	mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
+	"github.com/ossf/scorecard/v4/log"
 )
 
 func Test_getRepoCommitHash(t *testing.T) {
@@ -72,6 +74,50 @@ func Test_getRepoCommitHash(t *testing.T) {
 	}
 }
 
+func Test_getRepoCommitHashLocal(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		name    string
+		path    string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:    "local directory",
+			path:    "testdata",
+			want:    "unknown",
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			logger := log.NewLogger(log.DebugLevel)
+			localDirClient := localdir.CreateLocalDirClient(context.Background(), logger)
+			localRepo, err := localdir.MakeLocalDirRepo("testdata")
+			if err != nil {
+				t.Errorf("MakeLocalDirRepo: %v", err)
+				return
+			}
+			if err := localDirClient.InitRepo(localRepo, clients.HeadSHA); err != nil {
+				t.Errorf("InitRepo: %v", err)
+				return
+			}
+
+			got, err := getRepoCommitHash(localDirClient)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("getRepoCommitHash() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("getRepoCommitHash() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestRunScorecards(t *testing.T) {
 	t.Parallel()
 	type args struct {