sha1dc: disable safe_hash feature

The safe_hash feature is designed to make sha1dc a drop-in
replacement for sha1, where colliding entries will get a
permuted hash to un-collide them. However, since we're
handling the collision case ourselves, this isn't helpful
(and is actually harmful, as it means you get the wrong
object id if you want to show it in a log message).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-03-16 18:08:49 -04:00 committed by Junio C Hamano
parent 45a574eec8
commit c0c20060af

View File

@ -1661,7 +1661,7 @@ void SHA1DCInit(SHA1_CTX* ctx)
ctx->ihv[3] = 0x10325476; ctx->ihv[3] = 0x10325476;
ctx->ihv[4] = 0xC3D2E1F0; ctx->ihv[4] = 0xC3D2E1F0;
ctx->found_collision = 0; ctx->found_collision = 0;
ctx->safe_hash = 1; ctx->safe_hash = 0;
ctx->ubc_check = 1; ctx->ubc_check = 1;
ctx->detect_coll = 1; ctx->detect_coll = 1;
ctx->reduced_round_coll = 0; ctx->reduced_round_coll = 0;