From patchwork Wed Dec 16 02:07:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Tan X-Patchwork-Id: 11976175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5541C4361B for ; Wed, 16 Dec 2020 02:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A203230FC for ; Wed, 16 Dec 2020 02:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725766AbgLPCIz (ORCPT ); Tue, 15 Dec 2020 21:08:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgLPCIy (ORCPT ); Tue, 15 Dec 2020 21:08:54 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AEEAC06179C for ; Tue, 15 Dec 2020 18:08:14 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id m9so11585576plt.5 for ; Tue, 15 Dec 2020 18:08:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=XoAjbg/+BDggwcVU/WQKJZiGjVrCcXt1m38/xdq+eiw=; b=b4kcLO4tpaY9Z86RTEIOn2YVDLVX6cb5T4qlZYc5Sh/NdkHRB4LbeAoQSC7E8XguBh 9DdJTCdD16DCxBYbkL+66GXpNsHvBKoabDxlzSzhCOv/fR/qCmJHx7H8Qe4Zub4cvsWO EPRzyCOG2lrMiIULvjCTHnpdUhEKKX8GEDKzAy5oBY18MMUr+sqd8H0uNGiA7BSQSgpL id48m4Jn2ROCKkvAQZAAVfZsHgZ9KTIGKdrVsF+NvBa/ZAKckgcjKvcpcslT2S1ZkyxO DACoA46ZZxi9yfoOS6tCbP6vbFoEFtsDvyxBfuW6RSL73xAt8S0ppWMr6rac6QGWaRAi TPcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XoAjbg/+BDggwcVU/WQKJZiGjVrCcXt1m38/xdq+eiw=; b=okfMBWZUamJ8E6s8VzJeRYCyTveYZ1hAaJEWAj0Dj5ga5CzzdsruF/HCo+NBQLcqNJ Zs6Ym5sXlcD3le4wBAM6Ygb3EfqTwk+Vgnx8kTdTXwf8a2qgZS4p/9dq9SIc96WNGcWs yWTAQP8dJGfotRIxCOXBgQEdSpXpR56GxQxeXczMly17xtiyvERLeHNNir56KEJrFcZy uN/M3soNQ8tfgmAcTXGwZpPL9mSTlrzdzMO8jmjXljmAV7WAwtsdA2IehjfBRD++k99H SPbHfzWF4xCdDiOsPZVE8q720TWHeXDH4tZPMv95GupGtQF0tn3UvuGBWjIvmhopjh/0 BtFQ== X-Gm-Message-State: AOAM532qWzJNYW1JNQIdV4TU0OsdWDaGXNOeSJ+1x4uIFoMgJMbzpu6S 90JH8n97dAZ2R5tZd/s11Ente66MCj1XCZH0U/EDcZL5Ph6wZu0ZVt2yjmdZRkuHSJDR2ZJk2vQ hApHl9IGSuCW+DGpDYpXy+cdNv94JFukTRkHp4DX+IkzpRWVNawKxfDJjA6gkGtG9JEapbiw/xv cE X-Google-Smtp-Source: ABdhPJx4T13djtjgJeDyI2nh/8sZ21MLf0aIlDX5K2C1UHBHYN0YVeSaKlZPgnqfxfFy0nofbrlWS/I2rDBnzCCpDzv/ Sender: "jonathantanmy via sendgmr" X-Received: from twelve4.c.googlers.com ([fda3:e722:ac3:10:24:72f4:c0a8:437a]) (user=jonathantanmy job=sendgmr) by 2002:a17:90a:8b94:: with SMTP id z20mr203260pjn.1.1608084493517; Tue, 15 Dec 2020 18:08:13 -0800 (PST) Date: Tue, 15 Dec 2020 18:07:57 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: <20201211210508.2337494-1-jonathantanmy@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v2 2/3] connect, transport: add no-op arg for future patch From: Jonathan Tan To: git@vger.kernel.org Cc: peff@peff.net, felipe.contreras@gmail.com, gitster@pobox.com, avarab@gmail.com, Jonathan Tan Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A future patch will require transport_get_remote_refs() and get_remote_refs() to gain a new argument. Add the argument in this patch, with no effect on execution, so that the future patch only needs to concern itself with new logic. Signed-off-by: Jonathan Tan --- builtin/clone.c | 2 +- builtin/fetch-pack.c | 3 ++- builtin/fetch.c | 2 +- builtin/ls-remote.c | 2 +- builtin/remote.c | 2 +- connect.c | 5 ++++- remote.h | 3 ++- transport-helper.c | 7 +++++-- transport-internal.h | 13 +++++-------- transport.c | 29 ++++++++++++++++++----------- transport.h | 7 ++++++- 11 files changed, 46 insertions(+), 29 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index a0841923cf..70f9450db4 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1264,7 +1264,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (!option_no_tags) strvec_push(&ref_prefixes, "refs/tags/"); - refs = transport_get_remote_refs(transport, &ref_prefixes); + refs = transport_get_remote_refs(transport, &ref_prefixes, NULL); if (refs) { int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 58b7c1fbdc..9f921dfab4 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -220,7 +220,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) version = discover_version(&reader); switch (version) { case protocol_v2: - get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL, args.stateless_rpc); + get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL, + args.stateless_rpc, NULL); break; case protocol_v1: case protocol_v0: diff --git a/builtin/fetch.c b/builtin/fetch.c index ecf8537605..a7ef59acfc 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1393,7 +1393,7 @@ static int do_fetch(struct transport *transport, if (must_list_refs) { trace2_region_enter("fetch", "remote_refs", the_repository); - remote_refs = transport_get_remote_refs(transport, &ref_prefixes); + remote_refs = transport_get_remote_refs(transport, &ref_prefixes, NULL); trace2_region_leave("fetch", "remote_refs", the_repository); } else remote_refs = NULL; diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 092917eca2..4cf3f60b1b 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -118,7 +118,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (server_options.nr) transport->server_options = &server_options; - ref = transport_get_remote_refs(transport, &ref_prefixes); + ref = transport_get_remote_refs(transport, &ref_prefixes, NULL); if (ref) { int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); repo_set_hash_algo(the_repository, hash_algo); diff --git a/builtin/remote.c b/builtin/remote.c index c1b211b272..246e62f118 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -950,7 +950,7 @@ static int get_remote_ref_states(const char *name, if (query) { transport = transport_get(states->remote, states->remote->url_nr > 0 ? states->remote->url[0] : NULL); - remote_refs = transport_get_remote_refs(transport, NULL); + remote_refs = transport_get_remote_refs(transport, NULL, NULL); transport_disconnect(transport); states->queried = 1; diff --git a/connect.c b/connect.c index 8b8f56cf6d..99d9052365 100644 --- a/connect.c +++ b/connect.c @@ -455,7 +455,8 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, struct ref **list, int for_push, const struct strvec *ref_prefixes, const struct string_list *server_options, - int stateless_rpc) + int stateless_rpc, + char **unborn_head_target) { int i; const char *hash_name; @@ -496,6 +497,8 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, /* Process response from server */ while (packet_reader_read(reader) == PACKET_READ_NORMAL) { + if (unborn_head_target) + BUG("NEEDSWORK: provide unborn HEAD target to caller while reading refs"); if (!process_ref_v2(reader, &list)) die(_("invalid ls-refs response: %s"), reader->line); } diff --git a/remote.h b/remote.h index 3211abdf05..967f2178d8 100644 --- a/remote.h +++ b/remote.h @@ -198,7 +198,8 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, struct ref **list, int for_push, const struct strvec *ref_prefixes, const struct string_list *server_options, - int stateless_rpc); + int stateless_rpc, + char **unborn_head_target); int resolve_remote_symref(struct ref *ref, struct ref *list); diff --git a/transport-helper.c b/transport-helper.c index 5f6e0b3bd8..5d97eba935 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1162,13 +1162,16 @@ static int has_attribute(const char *attrs, const char *attr) } static struct ref *get_refs_list(struct transport *transport, int for_push, - const struct strvec *ref_prefixes) + const struct strvec *ref_prefixes, + char **unborn_head_target) { get_helper(transport); if (process_connect(transport, for_push)) { do_take_over(transport); - return transport->vtable->get_refs_list(transport, for_push, ref_prefixes); + return transport->vtable->get_refs_list(transport, for_push, + ref_prefixes, + unborn_head_target); } return get_refs_list_using_list(transport, for_push); diff --git a/transport-internal.h b/transport-internal.h index 27c9daffc4..5037f6197d 100644 --- a/transport-internal.h +++ b/transport-internal.h @@ -18,19 +18,16 @@ struct transport_vtable { * the transport to try to share connections, for_push is a * hint as to whether the ultimate operation is a push or a fetch. * - * If communicating using protocol v2 a list of prefixes can be - * provided to be sent to the server to enable it to limit the ref - * advertisement. Since ref filtering is done on the server's end, and - * only when using protocol v2, this list will be ignored when not - * using protocol v2 meaning this function can return refs which don't - * match the provided ref_prefixes. - * * If the transport is able to determine the remote hash for * the ref without a huge amount of effort, it should store it * in the ref's old_sha1 field; otherwise it should be all 0. + * + * See transport_get_remote_refs() for information on ref_prefixes and + * unborn_head_target. **/ struct ref *(*get_refs_list)(struct transport *transport, int for_push, - const struct strvec *ref_prefixes); + const struct strvec *ref_prefixes, + char **unborn_head_target); /** * Fetch the objects for the given refs. Note that this gets diff --git a/transport.c b/transport.c index 47da955e4f..815e175017 100644 --- a/transport.c +++ b/transport.c @@ -127,7 +127,8 @@ struct bundle_transport_data { static struct ref *get_refs_from_bundle(struct transport *transport, int for_push, - const struct strvec *ref_prefixes) + const struct strvec *ref_prefixes, + char **unborn_head_target) { struct bundle_transport_data *data = transport->data; struct ref *result = NULL; @@ -163,7 +164,7 @@ static int fetch_refs_from_bundle(struct transport *transport, int ret; if (!data->get_refs_from_bundle_called) - get_refs_from_bundle(transport, 0, NULL); + get_refs_from_bundle(transport, 0, NULL, NULL); ret = unbundle(the_repository, &data->header, data->fd, transport->progress ? BUNDLE_VERBOSE : 0); transport->hash_algo = data->header.hash_algo; @@ -281,7 +282,7 @@ static void die_if_server_options(struct transport *transport) */ static struct ref *handshake(struct transport *transport, int for_push, const struct strvec *ref_prefixes, - int must_list_refs) + int must_list_refs, char **unborn_head_target) { struct git_transport_data *data = transport->data; struct ref *refs = NULL; @@ -301,7 +302,8 @@ static struct ref *handshake(struct transport *transport, int for_push, get_remote_refs(data->fd[1], &reader, &refs, for_push, ref_prefixes, transport->server_options, - transport->stateless_rpc); + transport->stateless_rpc, + unborn_head_target); break; case protocol_v1: case protocol_v0: @@ -324,9 +326,11 @@ static struct ref *handshake(struct transport *transport, int for_push, } static struct ref *get_refs_via_connect(struct transport *transport, int for_push, - const struct strvec *ref_prefixes) + const struct strvec *ref_prefixes, + char **unborn_head_target) { - return handshake(transport, for_push, ref_prefixes, 1); + return handshake(transport, for_push, ref_prefixes, 1, + unborn_head_target); } static int fetch_refs_via_pack(struct transport *transport, @@ -370,7 +374,7 @@ static int fetch_refs_via_pack(struct transport *transport, break; } } - refs_tmp = handshake(transport, 0, NULL, must_list_refs); + refs_tmp = handshake(transport, 0, NULL, must_list_refs, NULL); } if (data->version == protocol_unknown_version) @@ -765,7 +769,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re return -1; if (!data->got_remote_heads) - get_refs_via_connect(transport, 1, NULL); + get_refs_via_connect(transport, 1, NULL, NULL); memset(&args, 0, sizeof(args)); args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); @@ -1251,7 +1255,8 @@ int transport_push(struct repository *r, trace2_region_enter("transport_push", "get_refs_list", r); remote_refs = transport->vtable->get_refs_list(transport, 1, - &ref_prefixes); + &ref_prefixes, + NULL); trace2_region_leave("transport_push", "get_refs_list", r); strvec_clear(&ref_prefixes); @@ -1370,12 +1375,14 @@ int transport_push(struct repository *r, } const struct ref *transport_get_remote_refs(struct transport *transport, - const struct strvec *ref_prefixes) + const struct strvec *ref_prefixes, + char **unborn_head_target) { if (!transport->got_remote_refs) { transport->remote_refs = transport->vtable->get_refs_list(transport, 0, - ref_prefixes); + ref_prefixes, + unborn_head_target); transport->got_remote_refs = 1; } diff --git a/transport.h b/transport.h index 24558c027d..65de0c9c00 100644 --- a/transport.h +++ b/transport.h @@ -241,9 +241,14 @@ int transport_push(struct repository *repo, * advertisement. Since ref filtering is done on the server's end (and only * when using protocol v2), this can return refs which don't match the provided * ref_prefixes. + * + * If unborn_head_target is not NULL, and the remote reports HEAD as pointing + * to an unborn branch, this function stores the unborn branch in + * unborn_head_target. It should be freed by the caller. */ const struct ref *transport_get_remote_refs(struct transport *transport, - const struct strvec *ref_prefixes); + const struct strvec *ref_prefixes, + char **unborn_head_target); /* * Fetch the hash algorithm used by a remote.