diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 17:00:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-23 18:57:42 +0300 |
| commit | 66713e84e713066f4984efdd1444a7567c4d9bde (patch) | |
| tree | f27bc88694fc388fc124da526414779de874d17c /t/t3203-branch-output.sh | |
| parent | 8164360fc8631d4090486b42e283c742a84887f8 (diff) | |
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>
Diffstat (limited to 't/t3203-branch-output.sh')
| -rwxr-xr-x | t/t3203-branch-output.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 71818b90f0..d65586541d 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -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 |