We're constructing raw objects and compute their sha1's in fast-import
just before saving them.
Extract header and sha1 computations so that we can get sha1 without
actually saving the object.
Signed-off-by: Dmitry Ivankov <divanorama@xxxxxxxxx>
---
fast-import.c | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 9e8d186..05cc55e 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1005,6 +1005,30 @@ static void cycle_packfile(void)
start_packfile();
}
+static void prepare_object_hash(
+ enum object_type type,
+ struct strbuf *dat,
+ unsigned char *hdr_out,
+ unsigned long *hdrlen_out,
+ unsigned char *sha1_out
+)
+{
+ unsigned char hdr_[96];
+ unsigned char *hdr = hdr_out ? hdr_out : hdr_;
+ unsigned long hdrlen;
+ git_SHA_CTX c;
+
+ hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
+ (unsigned long)dat->len) + 1;
+ git_SHA1_Init(&c);
+ git_SHA1_Update(&c, hdr, hdrlen);
+ git_SHA1_Update(&c, dat->buf, dat->len);
+ git_SHA1_Final(sha1_out, &c);
+
+ if (hdrlen_out)
+ *hdrlen_out = hdrlen;
+}
+
static int store_object(
enum object_type type,
struct strbuf *dat,
@@ -1017,15 +1041,9 @@ static int store_object(
unsigned char hdr[96];
unsigned char sha1[20];
unsigned long hdrlen, deltalen;
- git_SHA_CTX c;
git_zstream s;
- hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
- (unsigned long)dat->len) + 1;
- git_SHA1_Init(&c);
- git_SHA1_Update(&c, hdr, hdrlen);
- git_SHA1_Update(&c, dat->buf, dat->len);
- git_SHA1_Final(sha1, &c);
+ prepare_object_hash(type, dat, hdr, &hdrlen, sha1);
if (sha1out)
hashcpy(sha1out, sha1);
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html