From: Patrick Steinhardt <ps@pks.im>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
"Mitja Bezenšek" <mitja.bezensek@login5.org>,
"Justin Tobler" <jltobler@gmail.com>
Subject: Re: [PATCH v4] fetch: advertise fetched refs when backfilling tags
Date: Fri, 23 Oct 2026 14:00:07 +0200 [thread overview]
Message-ID: <attMR_XBdfkO3SHx@pks.im> (raw)
In-Reply-To: <CAOLa=ZTe6zeapUBwF2cS=w_gDQzm08RJkezD-jm9aV=7j1u6KA@mail.gmail.com>
On Fri, Oct 23, 2026 at 03:58:11AM -0700, Karthik Nayak wrote:
> Patrick Steinhardt <ps@pks.im> writes:
> > on thu, oct 22, 2026 at 11:00:16pm +0200, karthik nayak wrote:
> >> diff --git a/builtin/fetch.c b/builtin/fetch.c
> >> index b2decc6cfd..9867e8c2ef 100644
> >> --- a/builtin/fetch.c
> >> +++ b/builtin/fetch.c
> >> @@ -1697,9 +1699,30 @@ static int backfill_tags(struct display_state *display_state,
> >> transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
> >> transport_set_option(transport, TRANS_OPT_DEPTH, "0");
> >> transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
> >> +
> >> + /*
> >> + * References fetched before the tag backfill aren't yet committed
> >> + * to disk, so negotiation cannot discover them. Advertise them to
> >> + * the server, so that it does not re-send objects we already have.
> >> + */
> >> + if (fetched_tips && fetched_tips->nr && transport->smart_options) {
> >> + struct oid_array **include_tips =
> >> + &transport->smart_options->negotiation_include_tips;
> >> + if (!*include_tips)
> >> + *include_tips = to_free = xcalloc(1, sizeof(**include_tips));
> >> + for (size_t i = 0; i < fetched_tips->nr; i++)
> >> + oid_array_append(*include_tips, &fetched_tips->oid[i]);
> >> + }
> >
> > Curious. Why don't we have `struct oid_array` as a local variable and
> > then simply `transport->smart_options->negotiation_include_tips =
> > &extra_tips`?
> >
>
> Because `transport->smart_options->negotiation_include_tips` may already
> be set when this function is called, so we only free it when we are the
> exclusive setters of the field.
Ah, okay. But if it was set already, what does it contain? And is it
okay that we essentially leak the fetched tips to our callers now if it
was set?
Patrick
next prev parent reply other threads:[~2026-10-23 12:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-08 22:10 [PATCH] fetch: commit references fetched before backfilling tags Karthik Nayak
2026-10-09 11:26 ` Patrick Steinhardt
2026-10-09 16:51 ` Justin Tobler
2026-10-09 22:16 ` Karthik Nayak
2026-10-09 22:31 ` Karthik Nayak
2026-10-12 15:29 ` [PATCH v2] " Karthik Nayak
2026-10-12 19:55 ` Junio C Hamano
2026-10-15 10:31 ` Karthik Nayak
2026-10-15 21:24 ` [PATCH v3] " Karthik Nayak
2026-10-20 23:05 ` Justin Tobler
2026-10-21 6:39 ` Patrick Steinhardt
2026-10-21 10:01 ` Karthik Nayak
2026-10-21 13:59 ` Justin Tobler
2026-10-22 9:13 ` Karthik Nayak
2026-10-21 10:05 ` Karthik Nayak
2026-10-22 21:00 ` [PATCH v4] fetch: advertise fetched refs when " Karthik Nayak
2026-10-23 6:40 ` Patrick Steinhardt
2026-10-23 10:58 ` Karthik Nayak
2026-10-23 12:00 ` Patrick Steinhardt [this message]
2026-10-23 22:01 ` Karthik Nayak
2026-10-23 22:12 ` Karthik Nayak
2026-10-28 9:47 ` [PATCH v5 0/3] " Karthik Nayak
2026-10-28 9:47 ` [PATCH v5 1/3] transport: add `transport_options_release()` Karthik Nayak
2026-10-28 11:42 ` Patrick Steinhardt
2026-10-28 20:18 ` Karthik Nayak
2026-10-29 8:07 ` Patrick Steinhardt
2026-10-29 10:02 ` Karthik Nayak
2026-10-28 9:48 ` [PATCH v5 2/3] fetch: advertise fetched refs when backfilling tags Karthik Nayak
2026-10-28 9:48 ` [PATCH v5 3/3] t5510: cover upstream info update on fetch failure Karthik Nayak
2026-10-28 11:42 ` Patrick Steinhardt
2026-10-28 20:19 ` Karthik Nayak
2026-10-29 12:45 ` [PATCH v6 0/3] fetch: advertise fetched refs when backfilling tags Karthik Nayak
2026-10-29 12:45 ` [PATCH v6 1/3] t5510: cover upstream info update on fetch failure Karthik Nayak
2026-10-29 12:45 ` [PATCH v6 2/3] transport: add `transport_options_release()` Karthik Nayak
2026-10-29 12:45 ` [PATCH v6 3/3] fetch: advertise fetched refs when backfilling tags Karthik Nayak
2026-10-29 14:00 ` [PATCH v6 0/3] " Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=attMR_XBdfkO3SHx@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jltobler@gmail.com \
--cc=karthik.188@gmail.com \
--cc=mitja.bezensek@login5.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.