fix: use pre-push stdin for push file detection (#1368)

supitsdu · mrexox · web-flow · commit f3fc175f6c63 · 2026-04-03T12:22:16.000+03:00
Co-authored-by: Valentin Kiselev &lt;mrexox@evilmartians.com&gt;
diff --git a/internal/git/repository.go b/internal/git/repository.go
@@ -23,9 +23,6 @@ const (
 	stashMessage      = "lefthook auto backup"
 	unstagedPatchName = "lefthook-unstaged.patch"
 	infoDirMode       = 0o775
-
-	// The result of `git hash-object -t tree /dev/null`.
-	emptyTreeSHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
 )
 
 var (
@@ -35,6 +32,7 @@ var (
 	reStashMessage            = regexp.MustCompile(`^(?P<stash>[^ ]+):\s*` + stashMessage)
 	cmdPushFilesBase          = []string{"git", "diff", "--name-only", "HEAD", "@{push}"}
 	cmdPushFilesHead          = []string{"git", "diff", "--name-only", "HEAD"}
+	cmdPushFilesTreeBase      = []string{"git", "ls-tree", "-r", "--name-only"}
 	cmdStagedFiles            = []string{"git", "diff", "--name-only", "--cached", "--diff-filter=ACMR"}
 	cmdStagedFilesWithDeleted = []string{"git", "diff", "--name-only", "--cached", "--diff-filter=ACMRD"}
 	cmdStatusShort            = []string{"git", "status", "--short", "--porcelain", "-z"}
@@ -212,7 +210,12 @@ func (r *Repository) resolveHeadBranch() string {
 		}
 	}
 
-	return emptyTreeSHA
+	// Nothing has been pushed yet or upstream is not set
+	if len(r.headBranch) == 0 {
+		return r.FindExistingFiles(append(cmdPushFilesTreeBase, "HEAD"), "")
+	}
+
+	return r.FindExistingFiles(append(cmdPushFilesHead, r.headBranch), "")
 }
 
 // PartiallyStagedFiles returns the list of files that have both staged and
diff --git a/internal/git/repository_test.go b/internal/git/repository_test.go
@@ -1,10 +1,15 @@
 package git
 
 import (
+	"errors"
 	"fmt"
+	"io"
+	"path/filepath"
 	"sync"
 	"testing"
 
+	"github.com/spf13/afero"
+
 	"github.com/evilmartians/lefthook/v2/tests/helpers/cmdtest"
 )
 
@@ -170,3 +175,52 @@ func TestChangeset(t *testing.T) {
 		})
 	}
 }
+
+func TestPushFiles(t *testing.T) {
+	t.Run("falls back to ls-tree for initial push without upstream", func(t *testing.T) {
+		fs := afero.NewMemMapFs()
+		root := "/repo"
+		readme := filepath.Join(root, "README.md")
+
+		if err := fs.MkdirAll(root, 0o755); err != nil {
+			t.Fatalf("unexpected error: %s", err)
+		}
+		if err := afero.WriteFile(fs, readme, []byte("readme"), 0o644); err != nil {
+			t.Fatalf("unexpected error: %s", err)
+		}
+
+		cmd := cmdtest.NewTracking(func(command string, _ string, out io.Writer) error {
+			switch command {
+			case "git diff --name-only HEAD @{push}":
+				return errors.New("no upstream configured")
+			case "git branch --remotes":
+				return nil
+			case "git ls-tree -r --name-only HEAD":
+				_, err := out.Write([]byte("README.md\nmissing.txt\n"))
+				return err
+			default:
+				t.Fatalf("unexpected command: %s", command)
+				return nil
+			}
+		})
+
+		repository := &Repository{
+			Fs:       fs,
+			RootPath: root,
+			Git: &CommandExecutor{
+				mu:  new(sync.Mutex),
+				cmd: cmd,
+			},
+		}
+		repository.Setup()
+
+		files, err := repository.PushFiles()
+		if err != nil {
+			t.Fatalf("unexpected error: %s", err)
+		}
+
+		if want := []string{"README.md"}; len(files) != len(want) || files[0] != want[0] {
+			t.Fatalf("expected %v, got %v", want, files)
+		}
+	})
+}
diff --git a/tests/integration/pre_push_sha256_initial.txt b/tests/integration/pre_push_sha256_initial.txt
@@ -0,0 +1,24 @@
+[windows] skip
+
+exec git init --object-format=sha256
+exec git config user.email "you@example.com"
+exec git config user.name "Your Name"
+exec git branch -m main
+exec git add -A
+exec git commit -m "initial"
+exec git init --bare --object-format=sha256 ../remote.git
+exec git remote add origin ../remote.git
+exec lefthook install
+exec git push -u origin main
+stdout 'PUSH README.md lefthook.yml'
+! stderr 'no upstream configured'
+! stderr 'ambiguous argument'
+exec git --git-dir ../remote.git rev-parse refs/heads/main
+
+-- lefthook.yml --
+pre-push:
+  jobs:
+    - run: echo PUSH {push_files}
+
+-- README.md --
+hello
