diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2021-04-26 01:02:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-27 07:31:39 (GMT) |
| commit | 14228447c9ce664a4e9c31ba10344ec5e4ea4ba5 (patch) | |
| tree | 75e66ea8ad821e4684497a995d9648658c37fcbf /tree-diff.c | |
| parent | 5a6dce70d7bb12ee2bc7926254c5b6741b91ac5f (diff) | |
| download | git-14228447c9ce664a4e9c31ba10344ec5e4ea4ba5.zip git-14228447c9ce664a4e9c31ba10344ec5e4ea4ba5.tar.gz git-14228447c9ce664a4e9c31ba10344ec5e4ea4ba5.tar.bz2 | |
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 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 7cebbb3..1572615 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -161,7 +161,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last, memcpy(p->path + base->len, path, pathlen); p->path[len] = 0; p->mode = mode; - oidcpy(&p->oid, oid ? oid : &null_oid); + oidcpy(&p->oid, oid ? oid : null_oid()); return p; } @@ -243,7 +243,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, mode_i = tp[i].entry.mode; } else { - oid_i = &null_oid; + oid_i = null_oid(); mode_i = 0; } |