From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 20 Apr 2005 08:34:54 +0000 (-0700)
Subject: The recent hash/compression switch-over missed the blob creation.
X-Git-Tag: v0.99~799
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f18ca7316631914776136455c151d70318299459;p=git.git

The recent hash/compression switch-over missed the blob creation.

Happily, convert-cache just magically fixes all errors.
---

diff --git a/update-cache.c b/update-cache.c
index 68d2f95c1..8ec69e22b 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -21,6 +21,7 @@ static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 	int max_out_bytes = size + 200;
 	void *out = malloc(max_out_bytes);
 	void *metadata = malloc(200);
+	int metadata_size;
 	void *in;
 	SHA_CTX c;
 
@@ -31,6 +32,13 @@ static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 	if (!out || (int)(long)in == -1)
 		return -1;
 
+	metadata_size = 1+sprintf(metadata, "blob %lu", size);
+
+	SHA1_Init(&c);
+	SHA1_Update(&c, metadata, metadata_size);
+	SHA1_Update(&c, in, size);
+	SHA1_Final(sha1, &c);
+
 	memset(&stream, 0, sizeof(stream));
 	deflateInit(&stream, Z_BEST_COMPRESSION);
 
@@ -38,7 +46,7 @@ static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 	 * ASCII size + nul byte
 	 */	
 	stream.next_in = metadata;
-	stream.avail_in = 1+sprintf(metadata, "blob %lu", size);
+	stream.avail_in = metadata_size;
 	stream.next_out = out;
 	stream.avail_out = max_out_bytes;
 	while (deflate(&stream, 0) == Z_OK)
@@ -54,10 +62,6 @@ static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 
 	deflateEnd(&stream);
 	
-	SHA1_Init(&c);
-	SHA1_Update(&c, out, stream.total_out);
-	SHA1_Final(sha1, &c);
-
 	return write_sha1_buffer(sha1, out, stream.total_out);
 }