[v2,01/27] t0060: preemptively adjust alignment

Message ID	0a05d319c0fc2e88b94ebe488af8d02a0ef63821.1605629548.git.gitgitgadget@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <0a05d319c0fc2e88b94ebe488af8d02a0ef63821.1605629548.git.gitgitgadget@gmail.com> In-Reply-To: <pull.762.v2.git.1605629547.gitgitgadget@gmail.com> References: <pull.762.git.1605221038.gitgitgadget@gmail.com> <pull.762.v2.git.1605629547.gitgitgadget@gmail.com> Date: Tue, 17 Nov 2020 16:12:01 +0000 Subject: [PATCH v2 01/27] 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>, 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 [v2,00/27] tests: use main as default branch name [v2,01/27] t0060: preemptively adjust alignment [v2,02/27] t[01]: adjust the references to the default branch name "main" [v2,03/27] t2: adjust the references to the default branch name "main" [v2,04/27] t3[0-3]: adjust the references to the default branch name "main" [v2,05/27] t3416: preemptively adjust alignment in a comment [v2,06/27] t34: adjust the references to the default branch name "main" [v2,07/27] t3[5-9]: adjust the references to the default branch name "main" [v2,08/27] t4: adjust the references to the default branch name "main" [v2,09/27] t5323: prepare centered comment for `master` -> `main` [v2,10/27] t5[0-4]: adjust the references to the default branch name "main" [v2,11/27] t5503: prepare aligned comment for replacing `master` with `main` [v2,12/27] t550: adjust the references to the default branch name "main" [v2,13/27] t551: adjust the references to the default branch name "main" [v2,14/27] t55[23]: adjust the references to the default branch name "main" [v2,15/27] t55[4-9]: adjust the references to the default branch name "main" [v2,16/27] t5[6-9]: adjust the references to the default branch name "main" [v2,17/27] t6[0-3]: adjust the references to the default branch name "main" [v2,18/27] t64: preemptively adjust alignment to prepare for `master` -> `main` [v2,19/27] t6[4-9]: adjust the references to the default branch name "main" [v2,20/27] t7[0-4]: adjust the references to the default branch name "main" [v2,21/27] t7[5-9]: adjust the references to the default branch name "main" [v2,22/27] t8: adjust the references to the default branch name "main" [v2,23/27] t9[0-4]: adjust the references to the default branch name "main" [v2,24/27] t9[5-7]: adjust the references to the default branch name "main" [v2,25/27] tests(git-p4): transition to the default branch name `main` [v2,26/27] t99*: adjust the references to the default branch name "main" [v2,27/27] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed [v2,28/27] tests: run tests omitted by PREPARE_FOR_MAIN_BRANCH

Message ID

0a05d319c0fc2e88b94ebe488af8d02a0ef63821.1605629548.git.gitgitgadget@gmail.com (mailing list archive)

State

Superseded

Headers

Message-Id: 
 <0a05d319c0fc2e88b94ebe488af8d02a0ef63821.1605629548.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.762.v2.git.1605629547.gitgitgadget@gmail.com>
References: <pull.762.git.1605221038.gitgitgadget@gmail.com>
        <pull.762.v2.git.1605629547.gitgitgadget@gmail.com>
Date: Tue, 17 Nov 2020 16:12:01 +0000
Subject: [PATCH v2 01/27] 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>,
 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. 17, 2020, 4:12 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

[v2,01/27] t0060: preemptively adjust alignment

Commit Message

Patch