git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Jeff King <peff@peff.net>
Subject: Re: [PATCH] t1309: use a non-loaded branch name in the `onbranch` test cases
Date: Wed, 18 Nov 2020 15:52:09 +0100
Message-ID: <87a6vera3q.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <pull.791.git.1605709410465.gitgitgadget@gmail.com>


On Wed, Nov 18 2020, Johannes Schindelin via GitGitGadget wrote:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> The `onbranch` test cases in question do not actually want to include
> anything; Instead, they want to verify that the `onbranch` code path
> does not regress in the early-config case or in the non-Git case, where
> the `onbranch` include is actually ignored.

It's unclear to me what this patch is for & why it's needed.

Yesterday in your v2 27/27 series you sent a different one that changed
this from s/master/main/g:
https://lore.kernel.org/git/b8fa037791683b50c3efb01aa6ac0d3f7b888a2b.1605629548.git.gitgitgadget@gmail.com/

That's on top of "next", but this one is on "master", the two would
conflict, and the 02/27 one seems like the right thing to do.

> Therefore, the actual branch name does not matter at all. We might just
> as well avoid racially-charged names here.

It seems to me the actual name matters a lot, and it must whatever the
default branch name is.

I.e. what the test is doing is producing intentionally broken config,
and asserting that we don't read it at an early stage.

Therefore if we regressed and started doing that the test wouldn't catch
it, because the default branch name is "master", or "main" if/when that
refs.c change lands, neither of which is "topic".

Maybe I'm missing something but it seems 58ebccb478 ("t1309: use short
branch name in includeIf.onbranch test", 2019-08-06) and your own
85fe0e800c ("config: work around bug with includeif:onbranch and early
config", 2019-07-31) which added the test support reading.


> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     t1309: use a non-loaded branch name in the onbranch test cases
>     
>     Just something I stumbled over while working on 
>     https://github.com/gitgitgadget/git/pull/762.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-791%2Fdscho%2Ft1309-onbranch-tests-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-791/dscho/t1309-onbranch-tests-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/791
>
>  t/t1309-early-config.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
> index ebb8e1aecb..b4a9158307 100755
> --- a/t/t1309-early-config.sh
> +++ b/t/t1309-early-config.sh
> @@ -91,11 +91,11 @@ test_expect_failure 'ignore .git/ with invalid config' '
>  
>  test_expect_success 'early config and onbranch' '
>  	echo "[broken" >broken &&
> -	test_with_config "[includeif \"onbranch:master\"]path=../broken"
> +	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
>  '
>  
>  test_expect_success 'onbranch config outside of git repo' '
> -	test_config_global includeIf.onbranch:master.path non-existent &&
> +	test_config_global includeIf.onbranch:topic.path non-existent &&
>  	nongit git help
>  '
>  
>
> base-commit: e31aba42fb12bdeb0f850829e008e1e3f43af500


  reply	other threads:[~2020-11-18 14:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 14:23 Johannes Schindelin via GitGitGadget
2020-11-18 14:52 ` Ævar Arnfjörð Bjarmason [this message]
2020-11-19  0:24   ` Johannes Schindelin
2020-11-19  7:35     ` Ævar Arnfjörð Bjarmason
2020-11-19 10:49       ` Johannes Schindelin
2020-11-19 11:41 ` [PATCH v2] t1309: use a neutral " Johannes Schindelin via GitGitGadget

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=87a6vera3q.fsf@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=peff@peff.net \
    --subject='Re: [PATCH] t1309: use a non-loaded branch name in the `onbranch` test cases' \
    /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

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git