diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:52:25 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:52:25 +0300 |
commit | f9babbc00f3da52a3c9843188b5ea8753cef461f (patch) | |
tree | 63abee605bf0f9c47e29d010da0c3a82f3a1ce4c /pack-bitmap-write.c | |
parent | e5d6cb4c0d7f037f467d24a84f71f41ad0152a7e (diff) | |
parent | 7673ecd2dcdcf0aae01cccdb5c25f9b96160a8c0 (diff) |
Merge branch 'eb/hash-transition' into seen
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
* eb/hash-transition: (30 commits)
t1016-compatObjectFormat: add tests to verify the conversion between objects
t1006: test oid compatibility with cat-file
t1006: rename sha1 to oid
test-lib: compute the compatibility hash so tests may use it
builtin/ls-tree: let the oid determine the output algorithm
object-file: handle compat objects in check_object_signature
tree-walk: init_tree_desc take an oid to get the hash algorithm
builtin/cat-file: let the oid determine the output algorithm
rev-parse: add an --output-object-format parameter
repository: implement extensions.compatObjectFormat
object-file: update object_info_extended to reencode objects
object-file-convert: convert commits that embed signed tags
object-file-convert: convert commit objects when writing
object-file-convert: don't leak when converting tag objects
object-file-convert: convert tag objects when writing
object-file-convert: add a function to convert trees between algorithms
object: factor out parse_mode out of fast-import and tree-walk into in object.h
cache: add a function to read an OID of a specific algorithm
tag: sign both hashes
commit: export add_header_signature to support handling signatures on tags
...
Diffstat (limited to 'pack-bitmap-write.c')
-rw-r--r-- | pack-bitmap-write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 990a9498d7..c6c8f94cc5 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -370,7 +370,7 @@ static int fill_bitmap_tree(struct bitmap *bitmap, if (parse_tree(tree) < 0) die("unable to load tree object %s", oid_to_hex(&tree->object.oid)); - init_tree_desc(&desc, tree->buffer, tree->size); + init_tree_desc(&desc, &tree->object.oid, tree->buffer, tree->size); while (tree_entry(&desc, &entry)) { switch (object_type(entry.mode)) { |