git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 9/9] t1400: prepare for `main` being default branch name
Date: Fri, 23 Oct 2020 14:00:06 +0000	[thread overview]
Message-ID: <e542010fdde91256566b7129e1526b749500842a.1603461606.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.758.v2.git.1603461606.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

In addition to the trivial search-and-replace, there are three
non-trivial adjustments necessary.

Mark the respective test cases with the transitional prereq and make
those non-trivial adjustments early, to make this change easier to
review.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1400-update-ref.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 770e7be363..4c01e08551 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' '
 	grep "fatal: badly quoted argument: \\\"master" err
 '
 
-test_expect_success 'stdin fails on invalid escape' '
-	echo "create $a \"ma\zter\"" >stdin &&
+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' '
+	echo "create $a \"ma\zn\"" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
+	grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
 '
 
 test_expect_success 'stdin fails on junk after quoted argument' '
@@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' '
 	test_cmp expect actual
 '
 
-test_expect_success 'stdin succeeds with escaped character' '
+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' '
 	git update-ref -d $a &&
-	echo "create $a \"ma\\163ter\"" >stdin &&
+	echo "create $a \"ma\\151n\"" >stdin &&
 	git update-ref --stdin <stdin &&
 	git rev-parse $m >expect &&
 	git rev-parse $a >actual &&
-- 
gitgitgadget

  parent reply	other threads:[~2020-10-23 14:00 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-19 19:31 [PATCH 00/10] Prepare for changing the default branch name main (last manual part) Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` [PATCH 01/10] fmt-merge-msg: also suppress "into main" by default Johannes Schindelin via GitGitGadget
2020-10-21 22:12   ` Junio C Hamano
2020-10-22 12:28     ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 02/10] t9801: use `--` in preparation for default branch rename Johannes Schindelin via GitGitGadget
2020-10-21 22:19   ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 03/10] tests: start moving to a different default main branch name Johannes Schindelin via GitGitGadget
2020-10-21 22:22   ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 04/10] t4013: prepare for the new default branch name "main" Johannes Schindelin via GitGitGadget
2020-10-21 22:23   ` Junio C Hamano
2020-10-22 12:27     ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 05/10] t6200: adjust suppression pattern to also match "main" Johannes Schindelin via GitGitGadget
2020-10-21 22:27   ` Junio C Hamano
2020-10-22 13:01     ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 06/10] t5703: adjust a test case for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-21 22:34   ` Junio C Hamano
2020-10-19 19:31 ` [PATCH 07/10] t3200: prepare for `main` being shorter than `master` Johannes Schindelin via GitGitGadget
2020-10-21 22:39   ` Junio C Hamano
2020-10-22 13:08     ` Johannes Schindelin
2020-10-19 19:31 ` [PATCH 08/10] t9902: prepare a test for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` [PATCH 09/10] tests: prepare aligned mentions of the " Johannes Schindelin via GitGitGadget
2020-10-19 19:31 ` [PATCH 10/10] t1400: prepare for `main` being " Johannes Schindelin via GitGitGadget
2020-10-21 21:59 ` [PATCH 00/10] Prepare for changing the default branch name main (last manual part) Junio C Hamano
2020-10-22 13:11   ` Johannes Schindelin
2020-10-23 13:59 ` [PATCH v2 0/9] " Johannes Schindelin via GitGitGadget
2020-10-23 13:59   ` [PATCH v2 1/9] fmt-merge-msg: also suppress "into main" by default Johannes Schindelin via GitGitGadget
2020-10-23 13:59   ` [PATCH v2 2/9] t9801: use `--` in preparation for default branch rename Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 3/9] tests: start moving to a different default main branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 4/9] t6200: adjust suppression pattern to also match "main" Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 5/9] t5703: adjust a test case for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 6/9] t3200: prepare for `main` being shorter than `master` Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 7/9] t9902: prepare a test for the upcoming default branch name Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` [PATCH v2 8/9] tests: prepare aligned mentions of the " Johannes Schindelin via GitGitGadget
2020-10-23 14:00   ` Johannes Schindelin via GitGitGadget [this message]
2020-10-23 15:59   ` [PATCH v2 0/9] Prepare for changing the default branch name main (last manual part) 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=e542010fdde91256566b7129e1526b749500842a.1603461606.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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).