From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 May 2021 07:59:46 +0000 (+0900)
Subject: Merge branch 'bc/hash-transition-interop-part-1'
X-Git-Tag: v2.32.0-rc0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aaa3c8065d86e8f25850eb79e90da68d6adcf03f;p=thirdparty%2Fgit.git

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
---

aaa3c8065d86e8f25850eb79e90da68d6adcf03f
diff --cc refs/debug.c
index 001e30651c,2665f94309..7db4abccc3
--- a/refs/debug.c
+++ b/refs/debug.c
@@@ -243,8 -243,7 +243,8 @@@ static int debug_read_raw_ref(struct re
  	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
  	int res = 0;
  
- 	oidcpy(oid, &null_oid);
+ 	oidcpy(oid, null_oid());
 +	errno = 0;
  	res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent,
  					    type);