tests: prepare aligned mentions of the default branch name
In some tests, the default branch name is part of aligned output. As we want to change the default branch name to `main`, which is two characters shorter than the old default branch name, we will have to adjust those tests. Since we use the original default branch name until the entire test suite has been adjusted accordingly, the touched test cases need to be guarded by a prereq (that is so far disabled so that they are skipped for now). The test cases that depend on those test cases that are newly guarded by that prereq naturally have to be guarded, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
8164360fc8
commit
66713e84e7
@ -329,7 +329,7 @@ test_expect_success '--color overrides auto-color' '
|
||||
test_cmp expect.color actual
|
||||
'
|
||||
|
||||
test_expect_success 'verbose output lists worktree path' '
|
||||
test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' '
|
||||
one=$(git rev-parse --short HEAD) &&
|
||||
two=$(git rev-parse --short master) &&
|
||||
cat >expect <<-EOF &&
|
||||
@ -337,7 +337,7 @@ test_expect_success 'verbose output lists worktree path' '
|
||||
ambiguous $one one
|
||||
branch-one $two two
|
||||
+ branch-two $one ($(pwd)/worktree_dir) one
|
||||
master $two two
|
||||
main $two two
|
||||
ref-to-branch $two two
|
||||
ref-to-remote $two two
|
||||
EOF
|
||||
|
Reference in New Issue
Block a user