mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <>
Cc: Johannes Schindelin <>,
	Johannes Schindelin <>
Subject: [PATCH] t1309: use a non-loaded branch name in the `onbranch` test cases
Date: Wed, 18 Nov 2020 14:23:30 +0000	[thread overview]
Message-ID: <> (raw)

From: Johannes Schindelin <>

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.

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

Signed-off-by: Johannes Schindelin <>
    t1309: use a non-loaded branch name in the onbranch test cases
    Just something I stumbled over while working on

Fetch-It-Via: git fetch pr-791/dscho/t1309-onbranch-tests-v1

 t/ | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/ b/t/
index ebb8e1aecb..b4a9158307 100755
--- a/t/
+++ b/t/
@@ -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:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 14:23 Johannes Schindelin via GitGitGadget [this message]
2020-11-18 14:52 ` [PATCH] t1309: use a non-loaded branch name in the `onbranch` test cases Ævar Arnfjörð Bjarmason
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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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

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).