diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-03-28 22:13:50 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-28 22:13:50 +0100 |
commit | 1002f28a527d33893f7dab068dbac7011f84af65 (patch) | |
tree | 9b9ada23d952e936d496597d03064c10d8d9f73d /http-push.c | |
parent | The eleventh batch (diff) | |
parent | t1016-compatObjectFormat: add tests to verify the conversion between objects (diff) | |
download | git-1002f28a527d33893f7dab068dbac7011f84af65.tar.xz git-1002f28a527d33893f7dab068dbac7011f84af65.zip |
Merge branch 'eb/hash-transition'
Work to support a repository that work with both SHA-1 and SHA-256
hash algorithms has started.
* 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 'http-push.c')
-rw-r--r-- | http-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c index 33db41bfac..1fe51226fd 100644 --- a/http-push.c +++ b/http-push.c @@ -1307,7 +1307,7 @@ static struct object_list **process_tree(struct tree *tree, obj->flags |= SEEN; p = add_one_object(obj, p); - 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)) { |