* Re: [PATCH] send-pack: clean up extra_have oid array
2025-06-27 22:09 [PATCH] send-pack: clean up extra_have oid array Jacob Keller
@ 2025-06-30 14:31 ` Junio C Hamano
2025-06-30 22:14 ` Jacob Keller
2025-07-01 17:40 ` Junio C Hamano
2025-07-03 15:38 ` Jeff King
2 siblings, 1 reply; 9+ messages in thread
From: Junio C Hamano @ 2025-06-30 14:31 UTC (permalink / raw)
To: Jacob Keller; +Cc: git, Jacob Keller
Jacob Keller <jacob.e.keller@intel•com> writes:
> 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?
> 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.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] send-pack: clean up extra_have oid array
2025-06-30 14:31 ` Junio C Hamano
@ 2025-06-30 22:14 ` Jacob Keller
0 siblings, 0 replies; 9+ messages in thread
From: Jacob Keller @ 2025-06-30 22:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jacob Keller, git
On Mon, Jun 30, 2025 at 7:31 AM Junio C Hamano <gitster@pobox•com> wrote:
>
> Jacob Keller <jacob.e.keller@intel•com> writes:
>
> > 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?
>
I probably won't personally have time to work on extending these tests.
Thanks,
Jake
> > 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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] send-pack: clean up extra_have oid array
2025-06-27 22:09 [PATCH] send-pack: clean up extra_have oid array Jacob Keller
2025-06-30 14:31 ` Junio C Hamano
@ 2025-07-01 17:40 ` Junio C Hamano
2025-07-01 20:36 ` Jacob Keller
2025-07-03 15:40 ` Jeff King
2025-07-03 15:38 ` Jeff King
2 siblings, 2 replies; 9+ messages in thread
From: Junio C Hamano @ 2025-07-01 17:40 UTC (permalink / raw)
To: Jacob Keller; +Cc: git, Jacob Keller
Jacob Keller <jacob.e.keller@intel•com> writes:
> 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;
There is an early exit from the function that would bypass these
clean-up. Perhaps something like this on top?
builtin/send-pack.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git c/builtin/send-pack.c w/builtin/send-pack.c
index b28da7ddd7..6ce9f6665a 100644
--- c/builtin/send-pack.c
+++ w/builtin/send-pack.c
@@ -305,9 +305,10 @@ int cmd_send_pack(int argc,
flags |= MATCH_REFS_MIRROR;
/* match them up */
- if (match_push_refs(local_refs, &remote_refs, &rs, flags))
- return -1;
-
+ if (match_push_refs(local_refs, &remote_refs, &rs, flags)) {
+ ret = -1;
+ goto cleanup;
+ }
if (!is_empty_cas(&cas))
apply_push_cas(&cas, remote, remote_refs);
@@ -340,6 +341,7 @@ int cmd_send_pack(int argc,
/* stable plumbing output; do not modify or localize */
fprintf(stderr, "Everything up-to-date\n");
+cleanup:
string_list_clear(&push_options, 0);
free_refs(remote_refs);
free_refs(local_refs);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] send-pack: clean up extra_have oid array
2025-07-01 17:40 ` Junio C Hamano
@ 2025-07-01 20:36 ` Jacob Keller
2025-07-01 21:12 ` Junio C Hamano
2025-07-03 15:40 ` Jeff King
1 sibling, 1 reply; 9+ messages in thread
From: Jacob Keller @ 2025-07-01 20:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jacob Keller
[-- Attachment #1.1: Type: text/plain, Size: 1622 bytes --]
On 7/1/2025 10:40 AM, Junio C Hamano wrote:
> Jacob Keller <jacob.e.keller@intel•com> writes:
>
>> 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;
>
> There is an early exit from the function that would bypass these
> clean-up. Perhaps something like this on top?
>
> builtin/send-pack.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git c/builtin/send-pack.c w/builtin/send-pack.c
> index b28da7ddd7..6ce9f6665a 100644
> --- c/builtin/send-pack.c
> +++ w/builtin/send-pack.c
> @@ -305,9 +305,10 @@ int cmd_send_pack(int argc,
> flags |= MATCH_REFS_MIRROR;
>
> /* match them up */
> - if (match_push_refs(local_refs, &remote_refs, &rs, flags))
> - return -1;
> -
> + if (match_push_refs(local_refs, &remote_refs, &rs, flags)) {
> + ret = -1;
> + goto cleanup;
> + }
> if (!is_empty_cas(&cas))
> apply_push_cas(&cas, remote, remote_refs);
>
> @@ -340,6 +341,7 @@ int cmd_send_pack(int argc,
> /* stable plumbing output; do not modify or localize */
> fprintf(stderr, "Everything up-to-date\n");
>
> +cleanup:
> string_list_clear(&push_options, 0);
> free_refs(remote_refs);
> free_refs(local_refs);
This addition looks good to me.
Thanks,
Jake
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] send-pack: clean up extra_have oid array
2025-07-01 20:36 ` Jacob Keller
@ 2025-07-01 21:12 ` Junio C Hamano
0 siblings, 0 replies; 9+ messages in thread
From: Junio C Hamano @ 2025-07-01 21:12 UTC (permalink / raw)
To: Jacob Keller; +Cc: git, Jacob Keller
Jacob Keller <jacob.e.keller@intel•com> writes:
> On 7/1/2025 10:40 AM, Junio C Hamano wrote:
>> Jacob Keller <jacob.e.keller@intel•com> writes:
>>
>>> 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;
>>
>> There is an early exit from the function that would bypass these
>> clean-up. Perhaps something like this on top?
>>
>> builtin/send-pack.c | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git c/builtin/send-pack.c w/builtin/send-pack.c
>> index b28da7ddd7..6ce9f6665a 100644
>> --- c/builtin/send-pack.c
>> +++ w/builtin/send-pack.c
>> @@ -305,9 +305,10 @@ int cmd_send_pack(int argc,
>> flags |= MATCH_REFS_MIRROR;
>>
>> /* match them up */
>> - if (match_push_refs(local_refs, &remote_refs, &rs, flags))
>> - return -1;
>> -
>> + if (match_push_refs(local_refs, &remote_refs, &rs, flags)) {
>> + ret = -1;
>> + goto cleanup;
>> + }
>> if (!is_empty_cas(&cas))
>> apply_push_cas(&cas, remote, remote_refs);
>>
>> @@ -340,6 +341,7 @@ int cmd_send_pack(int argc,
>> /* stable plumbing output; do not modify or localize */
>> fprintf(stderr, "Everything up-to-date\n");
>>
>> +cleanup:
>> string_list_clear(&push_options, 0);
>> free_refs(remote_refs);
>> free_refs(local_refs);
>
> This addition looks good to me.
Thanks for a quick sanity check. I'll queue it on top of yours,
then.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] send-pack: clean up extra_have oid array
2025-07-01 17:40 ` Junio C Hamano
2025-07-01 20:36 ` Jacob Keller
@ 2025-07-03 15:40 ` Jeff King
2025-07-03 16:26 ` Jacob Keller
1 sibling, 1 reply; 9+ messages in thread
From: Jeff King @ 2025-07-03 15:40 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jacob Keller, git, Jacob Keller
On Tue, Jul 01, 2025 at 10:40:21AM -0700, Junio C Hamano wrote:
> There is an early exit from the function that would bypass these
> clean-up. Perhaps something like this on top?
>
> builtin/send-pack.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git c/builtin/send-pack.c w/builtin/send-pack.c
> index b28da7ddd7..6ce9f6665a 100644
> --- c/builtin/send-pack.c
> +++ w/builtin/send-pack.c
> @@ -305,9 +305,10 @@ int cmd_send_pack(int argc,
> flags |= MATCH_REFS_MIRROR;
>
> /* match them up */
> - if (match_push_refs(local_refs, &remote_refs, &rs, flags))
> - return -1;
> -
> + if (match_push_refs(local_refs, &remote_refs, &rs, flags)) {
> + ret = -1;
> + goto cleanup;
> + }
> if (!is_empty_cas(&cas))
> apply_push_cas(&cas, remote, remote_refs);
>
> @@ -340,6 +341,7 @@ int cmd_send_pack(int argc,
> /* stable plumbing output; do not modify or localize */
> fprintf(stderr, "Everything up-to-date\n");
>
> +cleanup:
> string_list_clear(&push_options, 0);
> free_refs(remote_refs);
> free_refs(local_refs);
This made me wonder if the remote_refs out-parameter is valid after
match_push_refs() returns failure (especially since we do not initialize
it at the top of the function).
I think the answer is "yes"; it is both an in-parameter and an
out-parameter, and will have been earlier set up via get_remote_heads().
So even on the failure case, match_push_refs() will leave it untouched
and it is still valid (and needs to be cleaned up).
-Peff
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] send-pack: clean up extra_have oid array
2025-07-03 15:40 ` Jeff King
@ 2025-07-03 16:26 ` Jacob Keller
0 siblings, 0 replies; 9+ messages in thread
From: Jacob Keller @ 2025-07-03 16:26 UTC (permalink / raw)
To: Jeff King, Junio C Hamano; +Cc: git, Jacob Keller
[-- Attachment #1.1: Type: text/plain, Size: 1685 bytes --]
On 7/3/2025 8:40 AM, Jeff King wrote:
> On Tue, Jul 01, 2025 at 10:40:21AM -0700, Junio C Hamano wrote:
>
>> There is an early exit from the function that would bypass these
>> clean-up. Perhaps something like this on top?
>>
>> builtin/send-pack.c | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git c/builtin/send-pack.c w/builtin/send-pack.c
>> index b28da7ddd7..6ce9f6665a 100644
>> --- c/builtin/send-pack.c
>> +++ w/builtin/send-pack.c
>> @@ -305,9 +305,10 @@ int cmd_send_pack(int argc,
>> flags |= MATCH_REFS_MIRROR;
>>
>> /* match them up */
>> - if (match_push_refs(local_refs, &remote_refs, &rs, flags))
>> - return -1;
>> -
>> + if (match_push_refs(local_refs, &remote_refs, &rs, flags)) {
>> + ret = -1;
>> + goto cleanup;
>> + }
>> if (!is_empty_cas(&cas))
>> apply_push_cas(&cas, remote, remote_refs);
>>
>> @@ -340,6 +341,7 @@ int cmd_send_pack(int argc,
>> /* stable plumbing output; do not modify or localize */
>> fprintf(stderr, "Everything up-to-date\n");
>>
>> +cleanup:
>> string_list_clear(&push_options, 0);
>> free_refs(remote_refs);
>> free_refs(local_refs);
>
> This made me wonder if the remote_refs out-parameter is valid after
> match_push_refs() returns failure (especially since we do not initialize
> it at the top of the function).
>
> I think the answer is "yes"; it is both an in-parameter and an
> out-parameter, and will have been earlier set up via get_remote_heads().
> So even on the failure case, match_push_refs() will leave it untouched
> and it is still valid (and needs to be cleaned up).
>
This was my assumption too.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] send-pack: clean up extra_have oid array
2025-06-27 22:09 [PATCH] send-pack: clean up extra_have oid array Jacob Keller
2025-06-30 14:31 ` Junio C Hamano
2025-07-01 17:40 ` Junio C Hamano
@ 2025-07-03 15:38 ` Jeff King
2 siblings, 0 replies; 9+ messages in thread
From: Jeff King @ 2025-07-03 15:38 UTC (permalink / raw)
To: Jacob Keller; +Cc: git, Jacob Keller
On Fri, Jun 27, 2025 at 03:09:04PM -0700, Jacob Keller wrote:
> 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.
Thanks, this looks good. At the time I did that other commit, I was
focused on just bug-hunting the leaks reported by the tests. So I missed
this one.
> 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 tests are leak-free now, but I suspect we have a lot of
slightly-exotic command invocations like this that still leak. It might
be nice to beef up the test coverage, but I'm OK with just fixing them,
too.
-Peff
^ permalink raw reply [flat|nested] 9+ messages in thread