From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, sluongng@gmail.com
Subject: Re: [PATCH] t5606: run clone branch name test with protocol v2
Date: Wed, 17 Mar 2021 11:18:59 -0700 [thread overview]
Message-ID: <xmqqo8fhwsmk.fsf@gitster.g> (raw)
In-Reply-To: <20210317154200.2656837-1-jonathantanmy@google.com> (Jonathan Tan's message of "Wed, 17 Mar 2021 08:42:00 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
> 4f37d45706 ("clone: respect remote unborn HEAD", 2021-02-05) introduces
> a new feature (if the remote has an unborn HEAD, e.g. when the remote
> repository is empty, use it as the name of the branch) that only works
> in protocol v2, but did not ensure that one of its tests always uses
> protocol v2, and thus that test would fail if
> GIT_TEST_PROTOCOL_VERSION=0 (or 1) is used. Therefore, add "-c
> protocol.version=2" to the appropriate test.
>
> (The rest of the tests from that commit have "-c protocol.version=2"
> already added.)
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> Thanks, Son Luong, for noticing this. Here's a fix for the
> GIT_TEST_PROTOCOL_VERSION part. This was built on 4f37d45706 but also
> applies cleanly on master.
Makes sense. And I do not see need for any other changes, like
test_expect_failure with protocol 0 (or 1).
Will queue as a candidate for maint-2.31.
Thanks.
>
> t/t5606-clone-options.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
> index ca6339a5fb..5e30772735 100755
> --- a/t/t5606-clone-options.sh
> +++ b/t/t5606-clone-options.sh
> @@ -106,7 +106,7 @@ test_expect_success 'chooses correct default initial branch name' '
> git -c init.defaultBranch=foo init --bare empty &&
> test_config -C empty lsrefs.unborn advertise &&
> GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
> - git -c init.defaultBranch=up clone empty whats-up &&
> + git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
> test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
> test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
> '
next prev parent reply other threads:[~2021-03-17 18:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 9:45 Tests failed with GIT_TEST_FAIL_PREREQS and/or GIT_TEST_PROTOCOL_VERSION Son Luong Ngoc
2021-03-16 13:52 ` Taylor Blau
2021-03-17 13:38 ` Son Luong Ngoc
2021-03-17 15:42 ` [PATCH] t5606: run clone branch name test with protocol v2 Jonathan Tan
2021-03-17 17:42 ` Jeff King
2021-03-17 18:18 ` Junio C Hamano [this message]
2021-03-17 17:54 ` Tests failed with GIT_TEST_FAIL_PREREQS and/or GIT_TEST_PROTOCOL_VERSION Jeff King
2021-03-17 22:47 ` [PATCH] t: annotate !PTHREADS tests with !FAIL_PREREQS Jeff King
2021-03-18 21:17 ` Junio C Hamano
2021-03-18 21:53 ` Jeff King
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=xmqqo8fhwsmk.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=sluongng@gmail.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).