diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-10 16:59:46 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-10 16:59:46 +0900 |
commit | aaa3c8065d86e8f25850eb79e90da68d6adcf03f (patch) | |
tree | ac8883284fe2e056252c14f6916e5ee9312eff1a /http-push.c | |
parent | 2d677e5b1537692a4f875740a6e9853c24285f02 (diff) | |
parent | 3dd71461e25b4cc7ea2a2d8deef1c0486bb32580 (diff) | |
download | git-aaa3c8065d86e8f25850eb79e90da68d6adcf03f.tar.gz |
Merge branch 'bc/hash-transition-interop-part-1'
SHA-256 transition.
* bc/hash-transition-interop-part-1:
hex: print objects using the hash algorithm member
hex: default to the_hash_algo on zero algorithm value
builtin/pack-objects: avoid using struct object_id for pack hash
commit-graph: don't store file hashes as struct object_id
builtin/show-index: set the algorithm for object IDs
hash: provide per-algorithm null OIDs
hash: set, copy, and use algo field in struct object_id
builtin/pack-redundant: avoid casting buffers to struct object_id
Use the final_oid_fn to finalize hashing of object IDs
hash: add a function to finalize object IDs
http-push: set algorithm when reading object ID
Always use oidread to read into struct object_id
hash: add an algo member to struct object_id
Diffstat (limited to 'http-push.c')
-rw-r--r-- | http-push.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/http-push.c b/http-push.c index 813123242e..d7cb1675a2 100644 --- a/http-push.c +++ b/http-push.c @@ -1022,6 +1022,8 @@ static void remote_ls(const char *path, int flags, /* extract hex from sharded "xx/x{38}" filename */ static int get_oid_hex_from_objpath(const char *path, struct object_id *oid) { + oid->algo = hash_algo_by_ptr(the_hash_algo); + if (strlen(path) != the_hash_algo->hexsz + 1) return -1; |