Skip to content

Commit

Permalink
builtin/ls-tree: let the oid determine the output algorithm
Browse files Browse the repository at this point in the history
Update cmd_ls_tree to call get_oid_with_context and pass
GET_OID_HASH_ANY instead of calling the simpler repo_get_oid.

This implments in ls-tree the behavior that asking to display a sha1
hash displays the corrresponding sha1 encoded object and asking to
display a sha256 hash displayes the corresponding sha256 encoded
object.

This is useful for testing the conversion of an object to an
equivlanet object encoded with a different hash function.

Signed-off-by: "Eric W. Biederman" <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
ebiederm authored and gitster committed Oct 2, 2023
1 parent 8d69175 commit c68be1f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion builtin/ls-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
OPT_END()
};
struct ls_tree_cmdmode_to_fmt *m2f = ls_tree_cmdmode_format;
struct object_context obj_context;
int ret;

git_config(git_default_config, NULL);
Expand Down Expand Up @@ -407,7 +408,9 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
ls_tree_usage, ls_tree_options);
if (argc < 1)
usage_with_options(ls_tree_usage, ls_tree_options);
if (repo_get_oid(the_repository, argv[0], &oid))
if (get_oid_with_context(the_repository, argv[0],
GET_OID_HASH_ANY, &oid,
&obj_context))
die("Not a valid object name %s", argv[0]);

/*
Expand Down

0 comments on commit c68be1f

Please sign in to comment.