Skip to content

Commit 56300ff

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 97cf8d5 commit 56300ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t3200-branch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ test_expect_success 'git branch --column -v should fail' '
375375
test_must_fail git branch --column -v
376376
'
377377

378-
test_expect_success 'git branch -v with column.ui ignored' '
378+
test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' '
379379
git config column.ui column &&
380-
COLUMNS=80 git branch -v | cut -c -9 | sed "s/ *$//" >actual &&
380+
COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual &&
381381
git config --unset column.ui &&
382382
cat >expect <<\EOF &&
383383
a/b/c

0 commit comments

Comments
 (0)