Merge pull request #1653 from onee-only/reuse-buffer

pjbgf · web-flow · commit 3a68d0404116 · 2025-09-10T13:02:14.000+01:00
utils: merkletrie, Reuse buf on doCalculateHashForRegular. Fixes #1423
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go
@@ -1,13 +1,13 @@
 package filesystem
 
 import (
-	"io"
 	"os"
 	"path"
 
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/go-git/go-git/v6/plumbing/filemode"
 	format "github.com/go-git/go-git/v6/plumbing/format/config"
+	"github.com/go-git/go-git/v6/utils/ioutil"
 	"github.com/go-git/go-git/v6/utils/merkletrie/noder"
 
 	"github.com/go-git/go-billy/v6"
@@ -180,7 +180,7 @@ func (n *node) doCalculateHashForRegular() plumbing.Hash {
 	defer f.Close()
 
 	h := plumbing.NewHasher(format.SHA1, plumbing.BlobObject, n.size)
-	if _, err := io.Copy(h, f); err != nil {
+	if _, err := ioutil.CopyBufferPool(h, f); err != nil {
 		return plumbing.ZeroHash
 	}
 
diff --git a/worktree_status_test.go b/worktree_status_test.go
@@ -6,7 +6,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/go-git/go-billy/v6/memfs"
 	"github.com/go-git/go-billy/v6/osfs"
+	fixtures "github.com/go-git/go-git-fixtures/v5"
 	"github.com/go-git/go-git/v6/plumbing/cache"
 	"github.com/go-git/go-git/v6/storage/filesystem"
 	"github.com/stretchr/testify/assert"
@@ -87,3 +89,25 @@ func TestIndexEntrySizeUpdatedForNonRegularFiles(t *testing.T) {
 	// Check whether the index was updated with the two new line breaks.
 	assert.Equal(t, uint32(len(content)+2), idx.Entries[0].Size)
 }
+
+func BenchmarkWorktreeStatus(b *testing.B) {
+	b.StopTimer()
+
+	f := fixtures.Basic().One()
+	st := filesystem.NewStorage(f.DotGit(), cache.NewObjectLRUDefault())
+
+	r, err := Open(st, memfs.New())
+	require.NoError(b, err)
+
+	wt, err := r.Worktree()
+	require.NoError(b, err)
+
+	err = wt.Reset(&ResetOptions{Mode: HardReset})
+	require.NoError(b, err)
+
+	b.StartTimer()
+
+	for range b.N {
+		wt.Status()
+	}
+}
