diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 23:42:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 23:42:43 +0300 |
commit | 0c601052a5f761fd9c207a56ae11789c8598e25d (patch) | |
tree | 3ede5e384f22b313aa16a5b6e85d3d764c52b6b0 /builtin | |
parent | 06aaafbd82aaf845d85c0f8eea78c52f1219187c (diff) | |
parent | 2b98478c6fc32b04434981c783b0472e0137cfad (diff) |
Merge branch 'jt/connectivity-check-optim-in-partial-clone'
Simplify the commit ancestry connectedness check in a partial clone
repository in which "promised" objects are assumed to be obtainable
lazily on-demand from promisor remote repositories.
* jt/connectivity-check-optim-in-partial-clone:
connected: always use partial clone optimization
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/clone.c | 7 | ||||
-rw-r--r-- | builtin/fetch.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index d8b1f413aa..ae27eefbe8 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -676,8 +676,7 @@ static void update_remote_refs(const struct ref *refs, const char *branch_top, const char *msg, struct transport *transport, - int check_connectivity, - int check_refs_are_promisor_objects_only) + int check_connectivity) { const struct ref *rm = mapped_refs; @@ -686,8 +685,6 @@ static void update_remote_refs(const struct ref *refs, opt.transport = transport; opt.progress = transport->progress; - opt.check_refs_are_promisor_objects_only = - !!check_refs_are_promisor_objects_only; if (check_connected(iterate_ref_map, &rm, &opt)) die(_("remote did not send all necessary objects")); @@ -1282,7 +1279,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) update_remote_refs(refs, mapped_refs, remote_head_points_at, branch_top.buf, reflog_msg.buf, transport, - !is_local, filter_options.choice); + !is_local); update_head(our_head_points_at, remote_head, reflog_msg.buf); diff --git a/builtin/fetch.c b/builtin/fetch.c index bf6bab80fa..1097e1e512 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -908,13 +908,6 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, if (!connectivity_checked) { struct check_connected_options opt = CHECK_CONNECTED_INIT; - if (filter_options.choice) - /* - * Since a filter is specified, objects indirectly - * referenced by refs are allowed to be absent. - */ - opt.check_refs_are_promisor_objects_only = 1; - rm = ref_map; if (check_connected(iterate_ref_map, &rm, &opt)) { rc = error(_("%s did not send all necessary objects\n"), url); |