[v3,02/28] t0060: preemptively adjust alignment

Message ID	8c2e158c8f3f33257306ea188a63167b2c2ab2e5.1605743087.git.gitgitgadget@gmail.com (mailing list archive)
State	Accepted
Commit	c2fdc8820c306c257a8ff11af3d18e3269a81213
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <8c2e158c8f3f33257306ea188a63167b2c2ab2e5.1605743087.git.gitgitgadget@gmail.com> In-Reply-To: <pull.762.v3.git.1605743086.gitgitgadget@gmail.com> References: <pull.762.v2.git.1605629547.gitgitgadget@gmail.com> <pull.762.v3.git.1605743086.gitgitgadget@gmail.com> Date: Wed, 18 Nov 2020 23:44:20 +0000 Subject: [PATCH v3 02/28] t0060: preemptively adjust alignment Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Felipe Contreras <felipe.contreras@gmail.com>, =?utf-8?b?w4Z2YXIgQXJu?= =?utf-8?b?ZmrDtnLDsA==?= Bjarmason <avarab@gmail.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>, Johannes Schindelin <johannes.schindelin@gmx.de>, Johannes Schindelin <johannes.schindelin@gmx.de> Precedence: bulk From: Johannes Schindelin <johannes.schindelin@gmx.de>
Series	tests: use main as default branch name \| expand [v3,00/28] tests: use main as default branch name [v3,01/28] tests: mark tests relying on the current default for `init.defaultBranch` [v3,02/28] t0060: preemptively adjust alignment [v3,03/28] t[01]: adjust the references to the default branch name "main" [v3,04/28] t2: adjust the references to the default branch name "main" [v3,05/28] t3[0-3]: adjust the references to the default branch name "main" [v3,06/28] t3416: preemptively adjust alignment in a comment [v3,07/28] t34: adjust the references to the default branch name "main" [v3,08/28] t3[5-9]: adjust the references to the default branch name "main" [v3,09/28] t4: adjust the references to the default branch name "main" [v3,10/28] t5323: prepare centered comment for `master` -> `main` [v3,11/28] t5[0-4]: adjust the references to the default branch name "main" [v3,12/28] t5503: prepare aligned comment for replacing `master` with `main` [v3,13/28] t550: adjust the references to the default branch name "main" [v3,14/28] t551: adjust the references to the default branch name "main" [v3,15/28] t55[23]: adjust the references to the default branch name "main" [v3,16/28] t55[4-9]: adjust the references to the default branch name "main" [v3,17/28] t5[6-9]: adjust the references to the default branch name "main" [v3,18/28] t6[0-3]: adjust the references to the default branch name "main" [v3,19/28] t64: preemptively adjust alignment to prepare for `master` -> `main` [v3,20/28] t6[4-9]: adjust the references to the default branch name "main" [v3,21/28] t7[0-4]: adjust the references to the default branch name "main" [v3,22/28] t7[5-9]: adjust the references to the default branch name "main" [v3,23/28] t8: adjust the references to the default branch name "main" [v3,24/28] t9[0-4]: adjust the references to the default branch name "main" [v3,25/28] t9[5-7]: adjust the references to the default branch name "main" [v3,26/28] tests(git-p4): transition to the default branch name `main` [v3,27/28] t99*: adjust the references to the default branch name "main" [v3,28/28] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed

Message ID

8c2e158c8f3f33257306ea188a63167b2c2ab2e5.1605743087.git.gitgitgadget@gmail.com (mailing list archive)

State

Accepted

Commit

c2fdc8820c306c257a8ff11af3d18e3269a81213

Headers

Message-Id: 
 <8c2e158c8f3f33257306ea188a63167b2c2ab2e5.1605743087.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.762.v3.git.1605743086.gitgitgadget@gmail.com>
References: <pull.762.v2.git.1605629547.gitgitgadget@gmail.com>
        <pull.762.v3.git.1605743086.gitgitgadget@gmail.com>
Date: Wed, 18 Nov 2020 23:44:20 +0000
Subject: [PATCH v3 02/28] t0060: preemptively adjust alignment
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>, =?utf-8?b?w4Z2YXIgQXJu?=
	=?utf-8?b?ZmrDtnLDsA==?= Bjarmason  <avarab@gmail.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>, Jeff King <peff@peff.net>,
 Jonathan Nieder <jrnieder@gmail.com>,
 Johannes Schindelin <johannes.schindelin@gmx.de>,
 Johannes Schindelin <johannes.schindelin@gmx.de>
Precedence: bulk
From: Johannes Schindelin <johannes.schindelin@gmx.de>

Series

tests: use main as default branch name | expand

Commit Message

Johannes Schindelin Nov. 18, 2020, 11:44 p.m. UTC

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

We are about to adjust t0060 for the new default branch name `main`.
This name is two characters shorter and therefore needs two spaces more
padding to align correctly.

Adjusting the alignment before the big search-and-replace makes it
easier to verify that the final result does not leave any misaligned
lines behind.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t0060-path-utils.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index b2e3cf3f4c..928eebbdc0 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -312,8 +312,8 @@  test_git_path GIT_COMMON_DIR=bar info/sparse-checkout     .git/info/sparse-check
 test_git_path GIT_COMMON_DIR=bar info//sparse-checkout    .git/info//sparse-checkout
 test_git_path GIT_COMMON_DIR=bar remotes/bar              bar/remotes/bar
 test_git_path GIT_COMMON_DIR=bar branches/bar             bar/branches/bar
-test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master   bar/logs/refs/heads/master
-test_git_path GIT_COMMON_DIR=bar refs/heads/master        bar/refs/heads/master
+test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master     bar/logs/refs/heads/master
+test_git_path GIT_COMMON_DIR=bar refs/heads/master          bar/refs/heads/master
 test_git_path GIT_COMMON_DIR=bar refs/bisect/foo          .git/refs/bisect/foo
 test_git_path GIT_COMMON_DIR=bar hooks/me                 bar/hooks/me
 test_git_path GIT_COMMON_DIR=bar config                   bar/config

[v3,02/28] t0060: preemptively adjust alignment

Commit Message

Patch