summaryrefslogtreecommitdiff
path: root/update-cache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-20 08:34:54 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-20 08:34:54 (GMT)
commitf18ca7316631914776136455c151d70318299459 (patch)
tree44fe67f62fc692e499873e65cc1fac5dfb7abe9f /update-cache.c
parentd98b46f8d9a3daf965a39f8c0089c1401e0081ee (diff)
downloadgit-f18ca7316631914776136455c151d70318299459.zip
git-f18ca7316631914776136455c151d70318299459.tar.gz
git-f18ca7316631914776136455c151d70318299459.tar.bz2
The recent hash/compression switch-over missed the blob creation.
Happily, convert-cache just magically fixes all errors.
Diffstat (limited to 'update-cache.c')
-rw-r--r--update-cache.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/update-cache.c b/update-cache.c
index 68d2f95..8ec69e2 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);
}