From fd59a255e6182ba3b73a1a21ee432c82c048e098 Mon Sep 17 00:00:00 2001
From: oliverpool <git@olivier.pfad.fr>
Date: Fri, 26 Apr 2024 10:02:47 +0200
Subject: [PATCH] fix: git.ComputeHash did not write the content
(cherry picked from commit 5247fd50dbd94de30c96feca844ff65286935404)
---
modules/git/object_format.go | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/modules/git/object_format.go b/modules/git/object_format.go
index a056b20e8a..c2fcf4c063 100644
--- a/modules/git/object_format.go
+++ b/modules/git/object_format.go
@@ -6,6 +6,7 @@ package git
import (
"crypto/sha1"
"crypto/sha256"
+ "hash"
"regexp"
"strconv"
)
@@ -33,6 +34,15 @@ type ObjectFormat interface {
ComputeHash(t ObjectType, content []byte) ObjectID
}
+func computeHash(dst []byte, hasher hash.Hash, t ObjectType, content []byte) []byte {
+ _, _ = hasher.Write(t.Bytes())
+ _, _ = hasher.Write([]byte(" "))
+ _, _ = hasher.Write([]byte(strconv.Itoa(len(content))))
+ _, _ = hasher.Write([]byte{0})
+ _, _ = hasher.Write(content)
+ return hasher.Sum(dst)
+}
+
/* SHA1 Type */
type Sha1ObjectFormatImpl struct{}
@@ -65,16 +75,9 @@ func (Sha1ObjectFormatImpl) MustID(b []byte) ObjectID {
// ComputeHash compute the hash for a given ObjectType and content
func (h Sha1ObjectFormatImpl) ComputeHash(t ObjectType, content []byte) ObjectID {
- hasher := sha1.New()
- _, _ = hasher.Write(t.Bytes())
- _, _ = hasher.Write([]byte(" "))
- _, _ = hasher.Write([]byte(strconv.FormatInt(int64(len(content)), 10)))
- _, _ = hasher.Write([]byte{0})
-
- // HashSum generates a SHA1 for the provided hash
- var sha1 Sha1Hash
- copy(sha1[:], hasher.Sum(nil))
- return &sha1
+ var obj Sha1Hash
+ computeHash(obj[:0], sha1.New(), t, content)
+ return &obj
}
/* SHA256 Type */
@@ -111,16 +114,9 @@ func (Sha256ObjectFormatImpl) MustID(b []byte) ObjectID {
// ComputeHash compute the hash for a given ObjectType and content
func (h Sha256ObjectFormatImpl) ComputeHash(t ObjectType, content []byte) ObjectID {
- hasher := sha256.New()
- _, _ = hasher.Write(t.Bytes())
- _, _ = hasher.Write([]byte(" "))
- _, _ = hasher.Write([]byte(strconv.FormatInt(int64(len(content)), 10)))
- _, _ = hasher.Write([]byte{0})
-
- // HashSum generates a SHA256 for the provided hash
- var sha256 Sha1Hash
- copy(sha256[:], hasher.Sum(nil))
- return &sha256
+ var obj Sha256Hash
+ computeHash(obj[:0], sha256.New(), t, content)
+ return &obj
}
var (