diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 16:00:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-23 17:57:41 +0200 |
| commit | 56300ff356bfa595c7d407323db1fb4cf279e2a7 (patch) | |
| tree | a91e7a942e7499e3d2718c64797ab1c27341fbd8 /t/t3200-branch.sh | |
| parent | t5703: adjust a test case for the upcoming default branch name (diff) | |
| download | git-56300ff356bfa595c7d407323db1fb4cf279e2a7.tar.xz git-56300ff356bfa595c7d407323db1fb4cf279e2a7.zip | |
t3200: prepare for `main` being shorter than `master`
In the test case adjusted by this patch, we want to cut just after the
longest shown ref name. Since `main` is shorter than `master`, we need
to decrease the number of characters. Since `topic` is shown, too, and
since that is only one character shorter than `master`, we decrement the
length by one instead of two.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 6efe7a44bc..55b24b76ce 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -375,9 +375,9 @@ test_expect_success 'git branch --column -v should fail' ' test_must_fail git branch --column -v ' -test_expect_success 'git branch -v with column.ui ignored' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' ' git config column.ui column && - COLUMNS=80 git branch -v | cut -c -9 | sed "s/ *$//" >actual && + COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual && git config --unset column.ui && cat >expect <<\EOF && a/b/c |