Re: [PATCH] send-pack: clean up extra_have oid array

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 30, 2025, 14:31 UTC
Message-ID: <xmqqfrfh5mis.fsf@gitster.g>
In-Reply-To: <20250627-jk-fix-leak-send-pack-v1-1-aadcf0ed8a4b@gmail.com>

Jacob Keller <jacob.e.keller@intel.com> writes:

Show 14 quoted lines

> From: Jacob Keller <jacob.keller@gmail.com>
>
> Commit c8009635785e ("fetch-pack, send-pack: clean up shallow oid
> array", 2024-09-25) cleaned up the shallow oid array in cmd_send_pack,
> but didn't clean up extra_have, which is still leaked at program exit.
> I suspect the particular tests in t5539 don't trigger any additions to
> the extra_have array, which explains why the tests can pass leak free
> despite this gap.
>
> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
> ---
> I didn't check to see why the t5539 tests don't leak. This leak occured for
> me in a day-to-day run with my local git build that happened to still have
> sanitizers enabled:

The other side may tell you about objects you _cannot_ fetch from them, but if you have them, these objects can participate in the common ancestor discovery and reduce the size of the transfer.

If the repository A you are pushing into use an alternate object store B (i.e., created by "git clone --reference B $URL A" to make A borrow from another local repository B) for example, the refs in that alternate B that point at objects not in the repository A are shown as "extra" objects.

Perhaps we can have these tests push into such a repository?

Show 12 quoted lines

> diff --git a/builtin/send-pack.c b/builtin/send-pack.c
> index c6e0e9d05186..61486e378cab 100644
> --- a/builtin/send-pack.c
> +++ b/builtin/send-pack.c
> @@ -343,6 +343,7 @@ int cmd_send_pack(int argc,
>  	free_refs(remote_refs);
>  	free_refs(local_refs);
>  	refspec_clear(&rs);
> +	oid_array_clear(&extra_have);
>  	oid_array_clear(&shallow);
>  	clear_cas_option(&cas);
>  	return ret;

The change looks obviously correct.

Thanks.