Re: [PATCH v2 01/10] packfile: move sizep computation

From: Taylor Blau <me@ttaylorr.com>
Date: Sep 17, 2024, 10:06 UTC
Message-ID: <ZulUw6nPfjE/aC+f@nand.local>
In-Reply-To: <20240823224630.1180772-2-e@80x24.org>

On Fri, Aug 23, 2024 at 10:46:21PM +0000, Eric Wong wrote:

Show 23 quoted lines

> From: Jeff King <peff@peff.net>
>
> Moving the sizep computation now makes the next commit to avoid
> redundant object info lookups easier to understand.  There is
> no user-visible change, here.
>
> [ew: commit message]
>
> Signed-off-by: Jeff King <peff@peff.net>
> Signed-off-by: Eric Wong <e@80x24.org>
> ---
>  packfile.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/packfile.c b/packfile.c
> index 813584646f..4028763947 100644
> --- a/packfile.c
> +++ b/packfile.c
> @@ -1536,24 +1536,24 @@ int packed_object_info(struct repository *r, struct packed_git *p,
>  			type = OBJ_BAD;
>  	} else {
>  		type = unpack_object_header(p, &w_curs, &curpos, &size);
> -	}

Omitted from the context here is that the "if" statement which this "else" belongs to is "if (oi->contentp)", so placing the "if (oi->sizep)" conditional within the else block is equivalent to the pre-image as you suggest.

With that additional detail, this patch looks obviously correct to me.

Thanks, Taylor