From: Matheus Tavares Date: Thu, 30 Jan 2020 20:32:18 +0000 (-0300) Subject: cache-tree: use given repo's hash_algo at verify_one() X-Git-Tag: v2.26.0-rc0~54^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6519467304dacb356da8a6c471d735ee6e846a4;p=thirdparty%2Fgit.git cache-tree: use given repo's hash_algo at verify_one() verify_one() takes a struct repository argument but uses the_hash_algo internally. Replace it with the provided repo's git_hash_algo, for consistency. For now, this is mainly a cosmetic change, as all callers of this function currently only pass the_repository to it. Signed-off-by: Matheus Tavares Signed-off-by: Junio C Hamano --- diff --git a/cache-tree.c b/cache-tree.c index 1bd1b23d38..8c51a15751 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -826,7 +826,7 @@ static void verify_one(struct repository *r, i++; } strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0'); - strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz); + strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz); } hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid); if (!oideq(&new_oid, &it->oid))