Fix LFS commit finder not working (#15856)
* Create a copy of the sha bytes. Co-authored-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
parent
1a5659943e
commit
df72cf6211
3 changed files with 12 additions and 9 deletions
|
@ -186,17 +186,18 @@ headerLoop:
|
||||||
// constant hextable to help quickly convert between 20byte and 40byte hashes
|
// constant hextable to help quickly convert between 20byte and 40byte hashes
|
||||||
const hextable = "0123456789abcdef"
|
const hextable = "0123456789abcdef"
|
||||||
|
|
||||||
// To40ByteSHA converts a 20-byte SHA in a 40-byte slice into a 40-byte sha in place
|
// To40ByteSHA converts a 20-byte SHA into a 40-byte sha. Input and output can be the
|
||||||
// without allocations. This is at least 100x quicker that hex.EncodeToString
|
// same 40 byte slice to support in place conversion without allocations.
|
||||||
// NB This requires that sha is a 40-byte slice
|
// This is at least 100x quicker that hex.EncodeToString
|
||||||
func To40ByteSHA(sha []byte) []byte {
|
// NB This requires that out is a 40-byte slice
|
||||||
|
func To40ByteSHA(sha, out []byte) []byte {
|
||||||
for i := 19; i >= 0; i-- {
|
for i := 19; i >= 0; i-- {
|
||||||
v := sha[i]
|
v := sha[i]
|
||||||
vhi, vlo := v>>4, v&0x0f
|
vhi, vlo := v>>4, v&0x0f
|
||||||
shi, slo := hextable[vhi], hextable[vlo]
|
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
|
// ParseTreeLineSkipMode reads an entry from a tree in a cat-file --batch stream
|
||||||
|
|
|
@ -310,7 +310,7 @@ revListLoop:
|
||||||
commits[0] = string(commitID)
|
commits[0] = string(commitID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
treeID = To40ByteSHA(treeID)
|
treeID = To40ByteSHA(treeID, treeID)
|
||||||
_, err = batchStdinWriter.Write(treeID)
|
_, err = batchStdinWriter.Write(treeID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -72,7 +72,7 @@ func FindLFSFile(repo *git.Repository, hash git.SHA1) ([]*LFSResult, error) {
|
||||||
|
|
||||||
fnameBuf := make([]byte, 4096)
|
fnameBuf := make([]byte, 4096)
|
||||||
modeBuf := make([]byte, 40)
|
modeBuf := make([]byte, 40)
|
||||||
workingShaBuf := make([]byte, 40)
|
workingShaBuf := make([]byte, 20)
|
||||||
|
|
||||||
for scan.Scan() {
|
for scan.Scan() {
|
||||||
// Get the next commit ID
|
// 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
|
resultsMap[curCommit.ID.String()+":"+curPath+string(fname)] = &result
|
||||||
} else if string(mode) == git.EntryModeTree.String() {
|
} 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)+"/")
|
paths = append(paths, curPath+string(fname)+"/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue