cache-tree: use given repo's hash_algo at verify_one()

matheustavares · gitster · commit a6519467304d · 2020-01-31T10:45:39.000-08:00
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 &lt;matheus.bernardino@usp.br&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ static void verify_one(struct repository *r,`
`826`	`826`	`i++;`
`827`	`827`	`}`
`828`	`828`	`strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');`
`829`		`- strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);`
	`829`	`+ strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz);`
`830`	`830`	`}`
`831`	`831`	`hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);`
`832`	`832`	`if (!oideq(&new_oid, &it->oid))`