René Scharfe <l.s.r@xxxxxx> writes:
> Subject: [PATCH] tree: simplify parse_tree_indirect()
>
> Reduce code duplication by turning parse_tree_indirect() into a wrapper
> of repo_peel_to_type(). This avoids a segfault when handling a broken
> tag where ->tagged is NULL. The new version also checks the return
> value of parse_object() that was ignored by the old one.
>
> Initial-patch-by: Stefan Sperling <stsp@xxxxxxxxx>
> Signed-off-by: René Scharfe <l.s.r@xxxxxx>
> ---
> tree.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/tree.c b/tree.c
> index 4720945e6a..1466bcc6a8 100644
> --- a/tree.c
> +++ b/tree.c
> @@ -244,19 +244,7 @@ void free_tree_buffer(struct tree *tree)
>
> struct tree *parse_tree_indirect(const struct object_id *oid)
> {
> - struct object *obj = parse_object(the_repository, oid);
> - do {
> - if (!obj)
> - return NULL;
> - if (obj->type == OBJ_TREE)
> - return (struct tree *) obj;
> - else if (obj->type == OBJ_COMMIT)
> - obj = &(get_commit_tree(((struct commit *)obj))->object);
> - else if (obj->type == OBJ_TAG)
> - obj = ((struct tag *) obj)->tagged;
> - else
> - return NULL;
> - if (!obj->parsed)
> - parse_object(the_repository, &obj->oid);
> - } while (1);
> + struct repository *r = the_repository;
> + struct object *obj = parse_object(r, oid);
> + return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE);
> }
Looks quite sensible to me; it is too simple that it makes me
worried that I might be missing something huge.
