[PATCH 1/6] t1004: insert missing "branch" in a message
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 9, 2020, 00:09 UTC
- Message-ID
- <1db6df30031bd13e3e01fe23a957c6841b9c1bf1.1604880565.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.784.git.1604880565.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
The message in question reads awkward with the name "master", but will be even more confusing once that is renamed to "main". Let's adjust it in advance of said rename.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t1004-read-tree-m-u-wf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index c13578a635..181956b241 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -20,7 +20,7 @@ test_expect_success 'two-way setup' ' git branch side && git tag -f branch-point && - echo file2 is not tracked on the master anymore && + echo file2 is not tracked on the master branch anymore && rm -f file2 subdir/file2 && git update-index --remove file2 subdir/file2 && git commit -a -m "master removes file2 and subdir/file2"
-- gitgitgadget