summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:43 -0700
commit0c601052a5f761fd9c207a56ae11789c8598e25d (patch)
tree3ede5e384f22b313aa16a5b6e85d3d764c52b6b0 /builtin/clone.c
parentMerge branch 'bc/faq' (diff)
parentconnected: always use partial clone optimization (diff)
downloadtgif-0c601052a5f761fd9c207a56ae11789c8598e25d.tar.xz
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/clone.c')
-rw-r--r--builtin/clone.c7
1 files changed, 2 insertions, 5 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);