From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 1/2] transport: die if server options are unsupported
Date: Fri, 12 Apr 2019 22:12:28 +0200 [thread overview]
Message-ID: <20190412201228.GA15936@szeder.dev> (raw)
In-Reply-To: <598b2de0162e240521f04d40d41eb11843be7198.1555098572.git.jonathantanmy@google.com>
On Fri, Apr 12, 2019 at 12:51:21PM -0700, Jonathan Tan wrote:
[Reordering the diffs...]
> diff --git a/transport.c b/transport.c
> index e078812897..77446119da 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -252,6 +252,14 @@ static int connect_setup(struct transport *transport, int for_push)
> return 0;
> }
>
> +static void die_if_server_options(struct transport *transport)
> +{
> + if (!transport->server_options || !transport->server_options->nr)
> + return;
> + advise(_("see protocol.version in 'git help config' for more details"));
> + die(_("server options require protocol version 2 or later"));
These two messages are translated ...
> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
> index db4ae09f2f..1e8357a4c7 100755
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -182,6 +182,13 @@ test_expect_success 'server-options are sent when using ls-remote' '
> grep "server-option=world" log
> '
>
> +test_expect_success 'warn if using server-option with ls-remote with legacy protocol' '
> + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
> + ls-remote -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
> +
> + grep "see protocol.version in" err &&
> + grep "server options require protocol version 2 or later" err
... therefore these should be 'test_i18ngrep'. This applies to the
other tests in this patch series as well.
> +'
>
> test_expect_success 'clone with file:// using protocol v2' '
> test_when_finished "rm -f log" &&
> @@ -251,6 +258,18 @@ test_expect_success 'server-options are sent when fetching' '
> grep "server-option=world" log
> '
>
> +test_expect_success 'warn if using server-option with fetch with legacy protocol' '
> + test_when_finished "rm -rf temp_child" &&
> +
> + git init temp_child &&
> +
> + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
> + fetch -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
> +
> + grep "see protocol.version in" err &&
> + grep "server options require protocol version 2 or later" err
> +'
> +
> test_expect_success 'upload-pack respects config using protocol v2' '
> git init server &&
> write_script server/.git/hook <<-\EOF &&
next prev parent reply other threads:[~2019-04-12 20:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 20:44 [PATCH] clone: send server options when using protocol v2 Jonathan Tan
2019-04-06 11:57 ` Jonathan Nieder
2019-04-08 17:11 ` Jonathan Tan
2019-04-09 15:24 ` Junio C Hamano
2019-04-09 18:49 ` Jonathan Tan
2019-04-09 20:31 ` [PATCH v2 0/2] Server options when cloning Jonathan Tan
2019-04-09 20:31 ` [PATCH v2 1/2] transport: warn if server options are unsupported Jonathan Tan
2019-04-09 20:45 ` Jonathan Nieder
2019-04-10 3:51 ` Junio C Hamano
2019-04-09 20:31 ` [PATCH v2 2/2] clone: send server options when using protocol v2 Jonathan Tan
2019-04-09 20:46 ` Jonathan Nieder
2019-04-11 20:30 ` [PATCH v3 0/2] Server options when cloning Jonathan Tan
2019-04-11 20:30 ` [PATCH v3 1/2] transport: warn if server options are unsupported Jonathan Tan
2019-04-12 5:35 ` Junio C Hamano
2019-04-11 20:30 ` [PATCH v3 2/2] clone: send server options when using protocol v2 Jonathan Tan
2019-04-12 19:51 ` [PATCH v4 0/2] Server options when cloning Jonathan Tan
2019-04-12 19:51 ` [PATCH v4 1/2] transport: die if server options are unsupported Jonathan Tan
2019-04-12 20:12 ` SZEDER Gábor [this message]
2019-04-15 4:48 ` Re* " Junio C Hamano
2019-04-15 4:54 ` Junio C Hamano
2019-04-15 9:43 ` SZEDER Gábor
2019-04-12 19:51 ` [PATCH v4 2/2] clone: send server options when using protocol v2 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=20190412201228.GA15936@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@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).