[PATCH 23/24] clone: unbundle the advertised bundles
- From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 20, 2022, 18:40 UTC
- Message-ID
- <a0cf2c0977b8a73d518cd5c04e3b1e765b4ecc89.1653072042.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1234.git.1653072042.gitgitgadget@gmail.com>
From: Derrick Stolee <derrickstolee@github.com>
A previous change introduced the transport methods to acquire a bundle list from the 'bundle-uri' protocol v2 verb, when advertised _and_ when the client has chosen to enable the feature.
Teach Git to download and unbundle the data advertised by those bundles during 'git clone'.
Also, since the --bundle-uri option exists, we do not want to mix the advertised bundles with the user-specified bundles.
Signed-off-by: Derrick Stolee <derrickstolee@github.com> --- builtin/clone.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index ca2291552f7..cbe392cf60f 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1263,11 +1263,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (refs) mapped_refs = wanted_peer_refs(refs, &remote->fetch); - /* - * Populate transport->got_remote_bundle_uri and - * transport->bundle_uri. We might get nothing. - */ - transport_get_remote_bundle_uri(transport, 1); + if (!bundle_uri) { + /* + * Populate transport->got_remote_bundle_uri and + * transport->bundle_uri. We might get nothing. + */ + transport_get_remote_bundle_uri(transport, 1); + + if (transport->bundles) { + /* At this point, we need the_repository to match the cloned repo. */ + repo_init(the_repository, git_dir, work_tree); + if (fetch_bundle_list(the_repository, + remote->url[0], + transport->bundles)) + warning(_("failed to fetch advertised bundles")); + } + } if (mapped_refs) { int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
-- gitgitgadget