Re: Reworked read-tree.

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sep 1, 2005, 15:55 UTC
Message-ID: <Pine.LNX.4.63.0509011143350.23242@iabervon.org>
In-Reply-To: <7vpsrt1cwc.fsf_-_@assigned-by-dhcp.cox.net>

On Thu, 1 Sep 2005, Junio C Hamano wrote:

> Daniel, I do not know what your current status is, but I think
> you need something like this.

Yup, I forgot to actually test that functionality.

Show 10 quoted lines

> ---
> diff --git a/tree.c b/tree.c
> --- a/tree.c
> +++ b/tree.c
> @@ -224,10 +224,12 @@ struct tree *parse_tree_indirect(const u
>  		if (obj->type == tree_type)
>  			return (struct tree *) obj;
>  		else if (obj->type == commit_type)
> -			return ((struct commit *) obj)->tree;
> +			obj = (struct object *)(((struct commit *) obj)->tree);

obj = &((struct commit *) obj)->tree->object;

Multiple sequential casts always bother me, and we do actually have a field for this.

>  		else if (obj->type == tag_type)
> -			obj = ((struct tag *) obj)->tagged;
> +			obj = deref_tag(obj);

Shouldn't be necessary (once you've got the parse_object below); we're already in a loop dereferencing things.

Show 8 quoted lines

>  		else
>  			return NULL;
> +		if (!obj->parsed)
> +			parse_object(obj->sha1);
>  	} while (1);
>  }
> 
>