From: steadmon@google.com
To: git@vger.kernel.org
Cc: sbeller@google.com, jrnieder@gmail.com, gitster@pobox.com
Subject: [PATCH v3 0/1] Advertise multiple supported proto versions
Date: Mon, 12 Nov 2018 13:49:04 -0800 [thread overview]
Message-ID: <cover.1542059029.git.steadmon@google.com> (raw)
In-Reply-To: <cover.1539305180.git.steadmon@google.com>
This is a minor iteration on v2, to change an error message to a BUG.
Josh Steadmon (1):
protocol: advertise multiple supported versions
builtin/archive.c | 3 ++
builtin/clone.c | 4 ++
builtin/fetch-pack.c | 4 ++
builtin/fetch.c | 5 ++
builtin/ls-remote.c | 5 ++
builtin/pull.c | 5 ++
builtin/push.c | 4 ++
builtin/send-pack.c | 3 ++
connect.c | 47 ++++++++---------
protocol.c | 112 ++++++++++++++++++++++++++++++++++++++---
protocol.h | 17 +++++++
remote-curl.c | 28 +++++++----
t/t5570-git-daemon.sh | 2 +-
t/t5700-protocol-v1.sh | 8 +--
t/t5702-protocol-v2.sh | 16 +++---
transport-helper.c | 6 +++
16 files changed, 214 insertions(+), 55 deletions(-)
Range-diff against v2:
1: 70986cec32 ! 1: b9968e3fb0 protocol: advertise multiple supported versions
@@ -358,7 +358,7 @@
+void register_allowed_protocol_version(enum protocol_version version)
+{
+ if (have_advertised_versions_already)
-+ error(_("attempting to register an allowed protocol version after advertisement"));
++ BUG(_("attempting to register an allowed protocol version after advertisement"));
+
+ ALLOC_GROW(allowed_versions, nr_allowed_versions + 1,
+ alloc_allowed_versions);
@@ -395,7 +395,6 @@
+ config_version = get_protocol_version_config();
+ if (config_version == protocol_v0) {
+ strbuf_addstr(advert, "version=0");
-+ trace_printf("Client advert string: %s", advert->buf);
+ return;
+ }
+
@@ -424,8 +423,6 @@
+ for (int i = 1; i < tmp_nr; i++)
+ strbuf_addf(advert, ":version=%s",
+ format_protocol_version(tmp_allowed_versions[i]));
-+
-+ trace_printf("Client advert string: %s", advert->buf);
+}
+
enum protocol_version determine_protocol_version_server(void)
--
2.19.1.930.g4563a0d9d0-goog
next prev parent reply other threads:[~2018-11-12 21:49 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 21:59 [PATCH 0/1] Limit client version advertisements Josh Steadmon
2018-10-02 21:59 ` [PATCH 1/1] protocol: limit max protocol version per service Josh Steadmon
2018-10-02 22:28 ` Stefan Beller
2018-10-03 21:33 ` Josh Steadmon
2018-10-03 22:47 ` Stefan Beller
2018-10-05 0:18 ` Josh Steadmon
2018-10-05 19:25 ` Stefan Beller
2018-10-10 23:53 ` Josh Steadmon
2018-10-12 23:30 ` Jonathan Nieder
2018-10-12 23:32 ` Jonathan Nieder
2018-10-12 23:45 ` Josh Steadmon
2018-10-12 23:53 ` Jonathan Nieder
2018-10-13 7:58 ` Junio C Hamano
2018-10-12 1:02 ` [PATCH v2 0/1] Advertise multiple supported proto versions steadmon
2018-10-12 1:02 ` [PATCH v2 1/1] protocol: advertise multiple supported versions steadmon
2018-10-12 22:30 ` Stefan Beller
2018-10-22 22:55 ` Josh Steadmon
2018-10-23 0:37 ` Stefan Beller
2018-11-12 21:49 ` steadmon [this message]
2018-11-12 21:49 ` [PATCH v3 " steadmon
2018-11-12 22:33 ` Stefan Beller
2018-11-13 3:24 ` Re* " Junio C Hamano
2018-11-13 19:21 ` Stefan Beller
2018-11-14 2:31 ` Junio C Hamano
2018-11-13 4:01 ` Junio C Hamano
2018-11-13 22:53 ` Josh Steadmon
2018-11-14 2:38 ` Junio C Hamano
2018-11-14 19:57 ` Josh Steadmon
2018-11-16 2:45 ` Junio C Hamano
2018-11-16 19:59 ` Josh Steadmon
2018-11-13 13:35 ` Junio C Hamano
2018-11-13 18:28 ` SZEDER Gábor
2018-11-13 23:03 ` Josh Steadmon
2018-11-14 0:47 ` SZEDER Gábor
2018-11-14 2:44 ` Junio C Hamano
2018-11-14 11:01 ` SZEDER Gábor
2018-11-14 2:30 ` [PATCH v4 0/1] Advertise multiple supported proto versions Josh Steadmon
2018-11-14 2:30 ` [PATCH v4 1/1] protocol: advertise multiple supported versions Josh Steadmon
2018-11-14 10:22 ` [PATCH v4 0/1] Advertise multiple supported proto versions Junio C Hamano
2018-11-14 19:51 ` Josh Steadmon
2018-11-16 10:46 ` Junio C Hamano
2018-11-16 22:34 ` [PATCH v5 " Josh Steadmon
2018-11-16 22:34 ` [PATCH v5 1/1] protocol: advertise multiple supported versions Josh Steadmon
2018-12-14 20:20 ` Ævar Arnfjörð Bjarmason
2018-12-14 21:58 ` Josh Steadmon
2018-12-14 22:39 ` Ævar Arnfjörð Bjarmason
2018-12-18 23:05 ` Josh Steadmon
2018-12-20 21:58 ` [PATCH v6 0/1] Advertise multiple supported proto versions Josh Steadmon
2018-12-20 21:58 ` [PATCH v6 1/1] protocol: advertise multiple supported versions Josh Steadmon
2019-02-05 19:42 ` Jonathan Tan
2019-02-07 23:58 ` Josh Steadmon
2019-02-11 18:53 ` Jonathan Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1542059029.git.steadmon@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).