diff options
| author | Derrick Stolee <derrickstolee@github.com> | 2022-12-22 15:14:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-25 07:24:24 (GMT) |
| commit | 876094ac16870727207e6afc0b26060101a52359 (patch) | |
| tree | 54e5ac961903b138d57997670589c370c54590bb /builtin | |
| parent | 12b0a14b9e5f140a9a4d5a3e3c47fae00a53c6fc (diff) | |
| download | git-876094ac16870727207e6afc0b26060101a52359.zip git-876094ac16870727207e6afc0b26060101a52359.tar.gz git-876094ac16870727207e6afc0b26060101a52359.tar.bz2 | |
clone: unbundle the advertised bundles
A previous change introduced the transport methods to acquire a bundle
list from the 'bundle-uri' protocol v2 command, 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'. This takes place between the ref advertisement and
the object data download, and stateful connections will linger while
the client downloads bundles. In the future, we should consider closing
the remote connection during this process.
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 5866873..430b2e9 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1271,11 +1271,26 @@ 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); + if (!bundle_uri) { + /* + * Populate transport->got_remote_bundle_uri and + * transport->bundle_uri. We might get nothing. + */ + transport_get_remote_bundle_uri(transport); + + if (transport->bundles && + hashmap_get_size(&transport->bundles->bundles)) { + /* At this point, we need the_repository to match the cloned repo. */ + if (repo_init(the_repository, git_dir, work_tree)) + warning(_("failed to initialize the repo, skipping bundle URI")); + else if (fetch_bundle_list(the_repository, + transport->bundles)) + warning(_("failed to fetch advertised bundles")); + } else { + clear_bundle_list(transport->bundles); + FREE_AND_NULL(transport->bundles); + } + } if (mapped_refs) { int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); |