undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Happily, convert-cache just magically fixes all errors.
This commit is contained in:
Linus Torvalds 2005-04-20 01:34:54 -07:00
parent d98b46f8d9
commit f18ca73166
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
update-cache.c
View File

@ -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);
}