Added compressed size and updated a few labels.

Author: Scott Arbeit

Makefile.win

@@ -5,28 +5,32 @@ GO111MODULES := 1
 
 # Use the project's go wrapper script via the -File parameter to avoid loading your profile
 GOSCRIPT := $(CURDIR)/script/go.ps1
-# GOSCRIPTCORRECTED := $(shell pwsh.exe -NoProfile -ExecutionPolicy Bypass -Command "$(GOSCRIPT) -replace '/', '\'")
 GO := pwsh.exe -NoProfile -ExecutionPolicy Bypass -File $(GOSCRIPT)
 
 # Get the build version from git using try/catch instead of "||"
-BUILD_VERSION := $(shell pwsh.exe -NoProfile -ExecutionPolicy Bypass -Command "try { git describe --tags --always --dirty 2>$null } catch { Write-Output 'unknown' }")
+BUILD_VERSION := $(shell pwsh.exe -NoProfile -ExecutionPolicy Bypass -Command "try { git describe --tags --always --dirty 2>$$null } catch { Write-Output 'unknown' }")
 LDFLAGS := -X github.com/github/git-sizer/main.BuildVersion=$(BUILD_VERSION)
 GOFLAGS := -mod=readonly
 
 ifdef USE_ISATTY
 GOFLAGS := $(GOFLAGS) --tags isatty
 endif
 
+# Find all Go source files
+GO_SRC_FILES := $(shell powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-ChildItem -Path . -Filter *.go -Recurse | Select-Object -ExpandProperty FullName")
+
 # Default target
 all: bin/git-sizer.exe
 
-# Main binary target
-bin/git-sizer.exe:
+# Main binary target - depend on all Go source files
+bin/git-sizer.exe: $(GO_SRC_FILES)
 	@powershell -NoProfile -ExecutionPolicy Bypass -Command "if (-not (Test-Path bin)) { New-Item -ItemType Directory -Path bin | Out-Null }"
-	$(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o .\bin\git-sizer.exe .
+	$(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -a -o .\bin\git-sizer.exe .
 
-# Test target
-test: bin/git-sizer.exe gotest
+# Test target - explicitly run the build first to ensure binary is up to date
+test:
+	@$(MAKE) -f Makefile.win bin/git-sizer.exe
+	@$(MAKE) -f Makefile.win gotest
 
 # Run go tests
 gotest:
@@ -48,4 +52,3 @@ help:
 	@powershell -NoProfile -ExecutionPolicy Bypass -Command "Write-Host 'Example usage:' -ForegroundColor Green"
 	@powershell -NoProfile -ExecutionPolicy Bypass -Command "Write-Host '  nmake -f Makefile.win'"
 	@powershell -NoProfile -ExecutionPolicy Bypass -Command "Write-Host '  nmake -f Makefile.win test'"
-	

git-sizer.go

@@ -331,6 +331,19 @@ func mainImplementation(ctx context.Context, stdout, stderr io.Writer, args []st
 		return fmt.Errorf("error scanning repository: %w", err)
 	}
 
+	// Calculate the actual size of the .git directory
+	gitDir, err := repo.GitDir()
+	if err != nil {
+		return fmt.Errorf("error getting Git directory path: %w", err)
+	}
+	
+	gitDirSize, err := sizes.CalculateGitDirSize(gitDir)
+	if err != nil {
+		return fmt.Errorf("error calculating Git directory size: %w", err)
+	}
+	
+	historySize.GitDirSize = gitDirSize
+
 	if jsonOutput {
 		var j []byte
 		var err error

git/git.go

@@ -150,8 +150,11 @@ func (repo *Repository) GitCommand(callerArgs ...string) *exec.Cmd {
 
 // GitDir returns the path to `repo`'s `GIT_DIR`. It might be absolute
 // or it might be relative to the current directory.
-func (repo *Repository) GitDir() string {
-	return repo.gitDir
+func (repo *Repository) GitDir() (string, error) {
+	if repo.gitDir == "" {
+		return "", errors.New("gitDir is not set")
+	}
+	return repo.gitDir, nil
 }
 
 // GitPath returns that path of a file within the git repository, by

sizes/dirsize.go

@@ -0,0 +1,28 @@
+package sizes
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/github/git-sizer/counts"
+)
+
+// CalculateGitDirSize returns the total size in bytes of the .git directory
+func CalculateGitDirSize(gitDir string) (counts.Count64, error) {
+	var totalSize counts.Count64
+
+	err := filepath.Walk(gitDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			// Skip files we can't access
+			return nil
+		}
+
+		// Only count files, not directories
+		if !info.IsDir() {
+			totalSize.Increment(counts.Count64(info.Size()))
+		}
+		return nil
+	})
+
+	return totalSize, err
+}

sizes/output.go

@@ -279,10 +279,10 @@ func (t *Threshold) Type() string {
 // A `pflag.Value` that can be used as a boolean option that sets a
 // `Threshold` variable to a fixed value. For example,
 //
-//		pflag.Var(
-//			sizes.NewThresholdFlagValue(&threshold, 30),
-//			"critical", "only report critical statistics",
-//		)
+//	pflag.Var(
+//		sizes.NewThresholdFlagValue(&threshold, 30),
+//		"critical", "only report critical statistics",
+//	)
 //
 // adds a `--critical` flag that sets `threshold` to 30.
 type thresholdFlagValue struct {
@@ -492,7 +492,7 @@ func (s *HistorySize) contents(refGroups []RefGroup) tableContents {
 	return S(
 		"",
 		S(
-			"Overall repository size",
+			"Repository statistics",
 			S(
 				"Commits",
 				I("uniqueCommitCount", "Count",
@@ -521,11 +521,18 @@ func (s *HistorySize) contents(refGroups []RefGroup) tableContents {
 				I("uniqueBlobCount", "Count",
 					"The total number of distinct blob objects",
 					nil, s.UniqueBlobCount, metric, "", 1.5e6),
-				I("uniqueBlobSize", "Total size",
+				I("uniqueBlobSize", "Uncompressed total size",
 					"The total size of all distinct blob objects",
 					nil, s.UniqueBlobSize, binary, "B", 10e9),
 			),
 
+			S(
+				"On-disk size",
+				I("gitDirSize", "Compressed total size",
+					"The actual on-disk size of the .git directory",
+					nil, s.GitDirSize, binary, "B", 1e9),
+			),
+
 			S(
 				"Annotated tags",
 				I("uniqueTagCount", "Count",

sizes/sizes.go

@@ -210,6 +210,9 @@ type HistorySize struct {
 
 	// The tree with the maximum expanded submodule count.
 	MaxExpandedSubmoduleCountTree *Path `json:"max_expanded_submodule_count_tree,omitempty"`
+	
+	// The actual size of the .git directory on disk
+	GitDirSize counts.Count64 `json:"git_dir_size"`
 }
 
 // Convenience function: forget `*path` if it is non-nil and overwrite