From 0f0d118c650fd0fe117063fbd196782b4f219410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 4 Mar 2022 19:32:10 +0100 Subject: [PATCH] transport: stop needlessly copying bundle header references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amend the logic added in fddf2ebe388 (transport: teach all vtables to allow fetch first, 2019-08-21) and save ourselves pointless work in fetch_refs_from_bundle(). The fetch_refs_from_bundle() caller doesn't care about the "struct ref *result" return value of get_refs_from_bundle(), and doesn't need any of the work we were doing in looping over the "data->header.references" in get_refs_from_bundle(). So this change saves us work, and also fixes a memory leak that we had when called from fetch_refs_from_bundle(). The other caller of get_refs_from_bundle() is the "get_refs_list" member we set up for the "struct transport_vtable bundle_vtable". That caller does care about the "struct ref *result" return value. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- transport.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/transport.c b/transport.c index 253d6671b1..70e9840a90 100644 --- a/transport.c +++ b/transport.c @@ -125,6 +125,21 @@ struct bundle_transport_data { unsigned get_refs_from_bundle_called : 1; }; +static void get_refs_from_bundle_inner(struct transport *transport) +{ + struct bundle_transport_data *data = transport->data; + + data->get_refs_from_bundle_called = 1; + + if (data->fd > 0) + close(data->fd); + data->fd = read_bundle_header(transport->url, &data->header); + if (data->fd < 0) + die(_("could not read bundle '%s'"), transport->url); + + transport->hash_algo = data->header.hash_algo; +} + static struct ref *get_refs_from_bundle(struct transport *transport, int for_push, struct transport_ls_refs_options *transport_options) @@ -136,15 +151,7 @@ static struct ref *get_refs_from_bundle(struct transport *transport, if (for_push) return NULL; - data->get_refs_from_bundle_called = 1; - - if (data->fd > 0) - close(data->fd); - data->fd = read_bundle_header(transport->url, &data->header); - if (data->fd < 0) - die(_("could not read bundle '%s'"), transport->url); - - transport->hash_algo = data->header.hash_algo; + get_refs_from_bundle_inner(transport); for (i = 0; i < data->header.references.nr; i++) { struct string_list_item *e = data->header.references.items + i; @@ -169,7 +176,7 @@ static int fetch_refs_from_bundle(struct transport *transport, strvec_push(&extra_index_pack_args, "-v"); if (!data->get_refs_from_bundle_called) - get_refs_from_bundle(transport, 0, NULL); + get_refs_from_bundle_inner(transport); ret = unbundle(the_repository, &data->header, data->fd, &extra_index_pack_args); transport->hash_algo = data->header.hash_algo;