From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/4] push: teach --base for ssh:// and file://
Date: Tue, 3 Nov 2020 11:23:07 +0100 [thread overview]
Message-ID: <20201103102307.GI24813@szeder.dev> (raw)
In-Reply-To: <148e39960a2185d2355cdfe34f8856e708fb1b80.1604362701.git.jonathantanmy@google.com>
On Mon, Nov 02, 2020 at 04:26:11PM -0800, Jonathan Tan wrote:
> diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
> index 022901b9eb..22459d37f5 100755
> --- a/t/t5700-protocol-v1.sh
> +++ b/t/t5700-protocol-v1.sh
> @@ -146,6 +146,56 @@ test_expect_success 'push with file:// using protocol v1' '
> grep "push< version 1" log
> '
>
> +test_expect_success 'push with file:// using protocol v1 and --base' '
> + test_commit -C file_child four &&
> + COMMON_HASH=$(git -C file_child rev-parse three) &&
> +
> + # Push to another branch, as the target repository has the
> + # master branch checked out and we cannot push into it.
> + GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
> + push --base=three origin HEAD:client_branch_four 2>log &&
> +
> + # Server responded using protocol v1
> + grep "push< version 1" log &&
> + # Server advertised only the expected object
> + grep "$COMMON_HASH .have" log
> +'
> +
> +test_expect_success 'push with file:// using protocol v0 and --base' '
> + test_commit -C file_child five &&
> + COMMON_HASH=$(git -C file_child rev-parse four) &&
> +
> + # Push to another branch, as the target repository has the
> + # master branch checked out and we cannot push into it.
> + GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=0 \
> + push --base=four origin HEAD:client_branch_five 2>log &&
> +
> + # Server did not respond with any version
> + ! grep "push< version" log &&
> + # Server advertised only the expected object
> + grep "$COMMON_HASH .have" log
> +'
> +
> +test_expect_success 'push with invalid --base' '
> + test_commit -C file_child six &&
> +
> + # Server does not have "six".
> + test_must_fail git -C file_child -c protocol.version=0 \
> + push --base=an_invalid_object origin HEAD:client_branch_six 2>log &&
> + grep "is not a valid object" log
This should rather use 'test_i18ngrep' ...
> +'
> +
> +test_expect_success 'push with --base that does not exist on server' '
> + COMMON_HASH=$(git -C file_child rev-parse six) &&
> +
> + # The push still succeeds.
> + GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=0 \
> + push --base=six origin HEAD:client_branch_six 2>log &&
> +
> + # Server did not advertise "six", since it does not know it
> + ! grep "$COMMON_HASH .have" log
> +'
> +
> # Test protocol v1 with 'ssh://' transport
> #
> test_expect_success 'setup ssh wrapper' '
> diff --git a/transport.c b/transport.c
> index ffe2115845..531ca0a834 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -236,6 +236,10 @@ static int set_git_option(struct git_transport_options *opts,
> list_objects_filter_die_if_populated(&opts->filter_options);
> parse_list_objects_filter(&opts->filter_options, value);
> return 0;
> + } else if (!strcmp(name, TRANS_OPT_PUSH_BASE)) {
> + if (get_oid(value, &opts->push_base))
> + die(_("transport: '%s' is not a valid object"), value);
... because the error message here is translated.
> + return 0;
> }
> return 1;
> }
next prev parent reply other threads:[~2020-11-03 10:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 0:26 [PATCH 0/4] "Push" protocol change proposal: user-specified base Jonathan Tan
2020-11-03 0:26 ` [PATCH 1/4] connect: refactor building of Extra Parameters Jonathan Tan
2020-11-03 0:26 ` [PATCH 2/4] push: teach --base for ssh:// and file:// Jonathan Tan
2020-11-03 10:23 ` SZEDER Gábor [this message]
2020-11-08 19:31 ` Junio C Hamano
2020-11-03 13:57 ` Derrick Stolee
2020-11-08 19:30 ` Junio C Hamano
2020-11-03 0:26 ` [PATCH 3/4] remote-curl: teach --base for http(s):// Jonathan Tan
2020-11-03 1:13 ` Junio C Hamano
2020-11-03 0:26 ` [PATCH 4/4] Doc: push with --base Jonathan Tan
2020-11-03 5:35 ` Jonathan Nieder
2020-11-03 15:18 ` Jeff King
2020-11-03 17:35 ` Junio C Hamano
2020-11-09 19:56 ` Jonathan Tan
2020-11-09 21:00 ` Derrick Stolee
2020-11-09 22:22 ` Jonathan Tan
2020-11-09 21:20 ` Junio C Hamano
2020-11-09 21:40 ` Jeff King
2020-11-09 22:47 ` Jonathan Tan
2020-11-03 13:53 ` Derrick Stolee
2020-11-03 0:46 ` [PATCH 0/4] "Push" protocol change proposal: user-specified base Junio C Hamano
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=20201103102307.GI24813@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).