From: Eric W. Biederman Date: Mon, 2 Oct 2023 02:40:30 +0000 (-0500) Subject: builtin/ls-tree: let the oid determine the output algorithm X-Git-Tag: v2.45.0-rc0~75^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c68be1fd31328472d994857e66c376dfc4562964;p=thirdparty%2Fgit.git builtin/ls-tree: let the oid determine the output algorithm 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" Signed-off-by: Junio C Hamano --- diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f558db5f3b..71281ab705 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -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); @@ -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]); /*