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 /xdiff-interface.c | |
parent | The fourteenth batch (diff) | |
parent | hex: print objects using the hash algorithm member (diff) | |
download | tgif-aaa3c8065d86e8f25850eb79e90da68d6adcf03f.tar.xz |
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 'xdiff-interface.c')
-rw-r--r-- | xdiff-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 4d20069302..609615db2c 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -172,7 +172,7 @@ void read_mmblob(mmfile_t *ptr, const struct object_id *oid) unsigned long size; enum object_type type; - if (oideq(oid, &null_oid)) { + if (oideq(oid, null_oid())) { ptr->ptr = xstrdup(""); ptr->size = 0; return; |