summaryrefslogtreecommitdiff
path: root/builtin/show-index.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2021-04-26 01:02:57 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-27 16:31:39 +0900
commitdd15f4f4570f9fed3012132adf9bf95cd921442b (patch)
tree75291c33172802bd3456183fd9a3dd5e547eb381 /builtin/show-index.c
parenthash: provide per-algorithm null OIDs (diff)
downloadtgif-dd15f4f4570f9fed3012132adf9bf95cd921442b.tar.xz
builtin/show-index: set the algorithm for object IDs
In most cases, when we load the hash of an object into a struct object_id, we load it using one of the oid* or *_oid_hex functions. However, for git show-index, we read it in directly using fread. As a consequence, set the algorithm correctly so the objects can be used correctly both now and in the future. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/show-index.c')
-rw-r--r--builtin/show-index.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/show-index.c b/builtin/show-index.c
index 8106b03a6b..0e0b9fb95b 100644
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -71,9 +71,11 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
uint32_t off;
} *entries;
ALLOC_ARRAY(entries, nr);
- for (i = 0; i < nr; i++)
+ for (i = 0; i < nr; i++) {
if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
die("unable to read sha1 %u/%u", i, nr);
+ entries[i].oid.algo = hash_algo_by_ptr(the_hash_algo);
+ }
for (i = 0; i < nr; i++)
if (fread(&entries[i].crc, 4, 1, stdin) != 1)
die("unable to read crc %u/%u", i, nr);