diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-12-07 12:44:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-07 12:44:49 -0800 |
commit | bb4921cf45e11d063e7bbe55f594adf8f0077d5d (patch) | |
tree | eae48e5666c03586904f835e45d70fe40d61977e /object-file.c | |
parent | The first batch to start the current cycle (diff) | |
parent | Add "test-tool dump-reftable" command. (diff) | |
download | tgif-bb4921cf45e11d063e7bbe55f594adf8f0077d5d.tar.xz |
Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
* hn/reftable:
Add "test-tool dump-reftable" command.
reftable: add dump utility
reftable: implement stack, a mutable database of reftable files.
reftable: implement refname validation
reftable: add merged table view
reftable: add a heap-based priority queue for reftable records
reftable: reftable file level tests
reftable: read reftable files
reftable: generic interface to tables
reftable: write reftable files
reftable: a generic binary tree implementation
reftable: reading/writing blocks
Provide zlib's uncompress2 from compat/zlib-compat.c
reftable: (de)serialization for the polymorphic record type.
reftable: add blocksource, an abstraction for random access reads
reftable: utility functions
reftable: add error related functionality
reftable: add LICENSE
hash.h: provide constants for the hash IDs
Diffstat (limited to 'object-file.c')
-rw-r--r-- | object-file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/object-file.c b/object-file.c index eb972cdccd..8d5a5b8afb 100644 --- a/object-file.c +++ b/object-file.c @@ -165,7 +165,6 @@ static void git_hash_unknown_final_oid(struct object_id *oid, git_hash_ctx *ctx) BUG("trying to finalize unknown hash"); } - const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { { NULL, @@ -184,8 +183,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { }, { "sha1", - /* "sha1", big-endian */ - 0x73686131, + GIT_SHA1_FORMAT_ID, GIT_SHA1_RAWSZ, GIT_SHA1_HEXSZ, GIT_SHA1_BLKSZ, @@ -200,8 +198,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { }, { "sha256", - /* "s256", big-endian */ - 0x73323536, + GIT_SHA256_FORMAT_ID, GIT_SHA256_RAWSZ, GIT_SHA256_HEXSZ, GIT_SHA256_BLKSZ, |