From df72cf62111114237324857d1393d31312bccca9 Mon Sep 17 00:00:00 2001
From: KN4CK3R <KN4CK3R@users.noreply.github.com>
Date: Fri, 14 May 2021 15:12:11 +0200
Subject: [PATCH] Fix LFS commit finder not working (#15856)
* Create a copy of the sha bytes.
Co-authored-by: Andrew Thornton <art27@cantab.net>
---
modules/git/batch_reader.go | 13 +++++++------
modules/git/commit_info_nogogit.go | 2 +-
modules/git/pipeline/lfs_nogogit.go | 6 ++++--
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go
index 3d3a6916f5..d6ee0ce8e0 100644
--- a/modules/git/batch_reader.go
+++ b/modules/git/batch_reader.go
@@ -186,17 +186,18 @@ headerLoop:
// constant hextable to help quickly convert between 20byte and 40byte hashes
const hextable = "0123456789abcdef"
-// To40ByteSHA converts a 20-byte SHA in a 40-byte slice into a 40-byte sha in place
-// without allocations. This is at least 100x quicker that hex.EncodeToString
-// NB This requires that sha is a 40-byte slice
-func To40ByteSHA(sha []byte) []byte {
+// To40ByteSHA converts a 20-byte SHA into a 40-byte sha. Input and output can be the
+// same 40 byte slice to support in place conversion without allocations.
+// This is at least 100x quicker that hex.EncodeToString
+// NB This requires that out is a 40-byte slice
+func To40ByteSHA(sha, out []byte) []byte {
for i := 19; i >= 0; i-- {
v := sha[i]
vhi, vlo := v>>4, v&0x0f
shi, slo := hextable[vhi], hextable[vlo]
- sha[i*2], sha[i*2+1] = shi, slo
+ out[i*2], out[i*2+1] = shi, slo
}
- return sha
+ return out
}
// ParseTreeLineSkipMode reads an entry from a tree in a cat-file --batch stream
diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go
index b69d50dfc0..485271f145 100644
--- a/modules/git/commit_info_nogogit.go
+++ b/modules/git/commit_info_nogogit.go
@@ -310,7 +310,7 @@ revListLoop:
commits[0] = string(commitID)
}
}
- treeID = To40ByteSHA(treeID)
+ treeID = To40ByteSHA(treeID, treeID)
_, err = batchStdinWriter.Write(treeID)
if err != nil {
return nil, err
diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go
index 6113bb301d..e618dd04b7 100644
--- a/modules/git/pipeline/lfs_nogogit.go
+++ b/modules/git/pipeline/lfs_nogogit.go
@@ -72,7 +72,7 @@ func FindLFSFile(repo *git.Repository, hash git.SHA1) ([]*LFSResult, error) {
fnameBuf := make([]byte, 4096)
modeBuf := make([]byte, 40)
- workingShaBuf := make([]byte, 40)
+ workingShaBuf := make([]byte, 20)
for scan.Scan() {
// Get the next commit ID
@@ -140,7 +140,9 @@ func FindLFSFile(repo *git.Repository, hash git.SHA1) ([]*LFSResult, error) {
}
resultsMap[curCommit.ID.String()+":"+curPath+string(fname)] = &result
} else if string(mode) == git.EntryModeTree.String() {
- trees = append(trees, git.To40ByteSHA(sha20byte))
+ sha40Byte := make([]byte, 40)
+ git.To40ByteSHA(sha20byte, sha40Byte)
+ trees = append(trees, sha40Byte)
paths = append(paths, curPath+string(fname)+"/")
}
}