diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-16 04:11:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-16 04:11:52 +0300 |
| commit | 4f598364519f5bb871caf12a482ed117a270588b (patch) | |
| tree | 2e76d92088cc31467cbdc357be90d8d6cf9b39ee /builtin/clone.c | |
| parent | 214242a6ab8a971fb1a8e80459b561bfcf93ae18 (diff) | |
| parent | 026df9e04789e2af7271566f312aae323740309f (diff) | |
Merge branch 'ds/bundle-uri-5'
The bundle-URI subsystem adds support for creation-token heuristics
to help incremental fetches.
* ds/bundle-uri-5:
bundle-uri: test missing bundles with heuristic
bundle-uri: store fetch.bundleCreationToken
fetch: fetch from an external bundle URI
bundle-uri: drop bundle.flag from design doc
clone: set fetch.bundleURI if appropriate
bundle-uri: download in creationToken order
bundle-uri: parse bundle.<id>.creationToken values
bundle-uri: parse bundle.heuristic=creationToken
t5558: add tests for creationToken heuristic
bundle: verify using check_connected()
bundle: test unbundling with incomplete history
Diffstat (limited to 'builtin/clone.c')
| -rw-r--r-- | builtin/clone.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 09b6d5788c..5691364ea1 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1248,12 +1248,16 @@ int cmd_clone(int argc, const char **argv, const char *prefix) * data from the --bundle-uri option. */ if (bundle_uri) { + int has_heuristic = 0; + /* 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_uri(the_repository, bundle_uri)) + else if (fetch_bundle_uri(the_repository, bundle_uri, &has_heuristic)) warning(_("failed to fetch objects from bundle URI '%s'"), bundle_uri); + else if (has_heuristic) + git_config_set_gently("fetch.bundleuri", bundle_uri); } strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD"); |