diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-09 00:09:20 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-09 13:07:19 -0800 |
| commit | 0b746f585eff4481aba2d42272ffa5d8806962a9 (patch) | |
| tree | 47acb4ab990faf9ee51abfd5a90402478ea6ffb8 | |
| parent | Git 2.29.2 (diff) | |
| download | tgif-0b746f585eff4481aba2d42272ffa5d8806962a9.tar.xz | |
t1004: insert missing "branch" in a message
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1004-read-tree-m-u-wf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |