]> git.ipfire.org Git - thirdparty/git.git/commitdiff
hex: print objects using the hash algorithm member
authorbrian m. carlson <sandals@crustytoothpaste.net>
Mon, 26 Apr 2021 01:03:01 +0000 (01:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Apr 2021 07:31:39 +0000 (16:31 +0900)
Now that all code paths correctly set the hash algorithm member of
struct object_id, write an object's hex representation using the hash
algorithm member embedded in it.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
hex.c

diff --git a/hex.c b/hex.c
index 74d256f239b1ddb136efef0d6fafaee2a57ff137..4f64d34696379d35e7ace281a5d471f55f1737ad 100644 (file)
--- a/hex.c
+++ b/hex.c
@@ -143,7 +143,7 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 
 char *oid_to_hex_r(char *buffer, const struct object_id *oid)
 {
-       return hash_to_hex_algop_r(buffer, oid->hash, the_hash_algo);
+       return hash_to_hex_algop_r(buffer, oid->hash, &hash_algos[oid->algo]);
 }
 
 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *algop)
@@ -161,5 +161,5 @@ char *hash_to_hex(const unsigned char *hash)
 
 char *oid_to_hex(const struct object_id *oid)
 {
-       return hash_to_hex_algop(oid->hash, the_hash_algo);
+       return hash_to_hex_algop(oid->hash, &hash_algos[oid->algo]);
 }