Merge branch 'jh/hash-init-fixes'
An earlier code refactoring of the hash machinery missed a few required calls to init_fn. * jh/hash-init-fixes: index-pack, unpack-objects: restore missing ->init_fnmaint
commit
8a753b9a44
|
@ -1286,6 +1286,7 @@ static void parse_pack_objects(unsigned char *hash)
|
|||
|
||||
/* Check pack integrity */
|
||||
flush();
|
||||
the_hash_algo->init_fn(&tmp_ctx);
|
||||
git_hash_clone(&tmp_ctx, &input_ctx);
|
||||
git_hash_final(hash, &tmp_ctx);
|
||||
if (!hasheq(fill(the_hash_algo->rawsz), hash, the_repository->hash_algo))
|
||||
|
|
|
@ -668,6 +668,7 @@ int cmd_unpack_objects(int argc,
|
|||
the_hash_algo->init_fn(&ctx);
|
||||
unpack_all();
|
||||
git_hash_update(&ctx, buffer, offset);
|
||||
the_hash_algo->init_fn(&tmp_ctx);
|
||||
git_hash_clone(&tmp_ctx, &ctx);
|
||||
git_hash_final_oid(&oid, &tmp_ctx);
|
||||
if (strict) {
|
||||
|
|
Loading…
Reference in New Issue