diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2021-04-26 03:02:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-27 09:31:39 +0200 |
| commit | 14228447c9ce664a4e9c31ba10344ec5e4ea4ba5 (patch) | |
| tree | 75e66ea8ad821e4684497a995d9648658c37fcbf /refs | |
| parent | hash: set, copy, and use algo field in struct object_id (diff) | |
| download | git-14228447c9ce664a4e9c31ba10344ec5e4ea4ba5.tar.xz git-14228447c9ce664a4e9c31ba10344ec5e4ea4ba5.zip | |
hash: provide per-algorithm null OIDs
Up until recently, object IDs did not have an algorithm member, only a
hash. Consequently, it was possible to share one null (all-zeros)
object ID among all hash algorithms. Now that we're going to be
handling objects from multiple hash algorithms, it's important to make
sure that all object IDs have a correct algorithm field.
Introduce a per-algorithm null OID, and add it to struct hash_algo.
Introduce a wrapper function as well, and use it everywhere we used to
use the null_oid constant.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/debug.c | 2 | ||||
| -rw-r--r-- | refs/files-backend.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/refs/debug.c b/refs/debug.c index 922e64fa6a..2665f94309 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -243,7 +243,7 @@ static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname, struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; int res = 0; - oidcpy(oid, &null_oid); + oidcpy(oid, null_oid()); res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent, type); diff --git a/refs/files-backend.c b/refs/files-backend.c index 119972ee16..3f29f8c143 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1084,7 +1084,7 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r) ref_transaction_add_update( transaction, r->name, REF_NO_DEREF | REF_HAVE_NEW | REF_HAVE_OLD | REF_IS_PRUNING, - &null_oid, &r->oid, NULL); + null_oid(), &r->oid, NULL); if (ref_transaction_commit(transaction, &err)) goto cleanup; |