diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2023-10-01 21:40:28 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-02 14:57:40 -0700 |
commit | efed687edcaa272601e0f4e192db368972daa7ac (patch) | |
tree | 4324acf56dc0100cc5fa0c14d8e88cf3e337323d /packfile.c | |
parent | d6222a2d05c93b22d5ef19b7361f7b1ef2964eb4 (diff) | |
download | git-efed687edcaa272601e0f4e192db368972daa7ac.tar.gz |
tree-walk: init_tree_desc take an oid to get the hash algorithm
To make it possible for git ls-tree to display the tree encoded
in the hash algorithm of the oid specified to git ls-tree, update
init_tree_desc to take as a parameter the oid of the tree object.
Update all callers of init_tree_desc and init_tree_desc_gently
to pass the oid of the tree object.
Use the oid of the tree object to discover the hash algorithm
of the oid and store that hash algorithm in struct tree_desc.
Use the hash algorithm in decode_tree_entry and
update_tree_entry_internal to handle reading a tree object encoded in
a hash algorithm that differs from the repositories hash algorithm.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
-rw-r--r-- | packfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c index 9cc0a2e37a..1fae0fcdd9 100644 --- a/packfile.c +++ b/packfile.c @@ -2250,7 +2250,8 @@ static int add_promisor_object(const struct object_id *oid, struct tree *tree = (struct tree *)obj; struct tree_desc desc; struct name_entry entry; - if (init_tree_desc_gently(&desc, tree->buffer, tree->size, 0)) + if (init_tree_desc_gently(&desc, &tree->object.oid, + tree->buffer, tree->size, 0)) /* * Error messages are given when packs are * verified, so do not print any here. |