diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:23 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | d6c6b10817409ed93d3c1f65b3d0d2b0875165d4 (patch) | |
| tree | 5a9990c3ab13c2a91abc705199c79f1ec030690d /t/t3205-branch-color.sh | |
| parent | t2*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-d6c6b10817409ed93d3c1f65b3d0d2b0875165d4.tar.xz | |
t3[0-3]*: adjust the references to the default branch name "main"
Carefully excluding t3040, which sees independent development elsewhere
at the time of writing, we transition above-mentioned tests to the
default branch name `main`. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t3[0-3]*.sh t3206/* &&
git checkout HEAD -- t3040\*)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3205-branch-color.sh')
| -rwxr-xr-x | t/t3205-branch-color.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh index 8b54a9252b..b905dc4867 100755 --- a/t/t3205-branch-color.sh +++ b/t/t3205-branch-color.sh @@ -1,14 +1,14 @@ #!/bin/sh test_description='basic branch output coloring' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success 'set up some sample branches' ' test_commit foo && - git update-ref refs/remotes/origin/master HEAD && + git update-ref refs/remotes/origin/main HEAD && git update-ref refs/heads/other HEAD ' @@ -22,9 +22,9 @@ test_expect_success 'set up some color config' ' test_expect_success 'regular output shows colors' ' cat >expect <<-\EOF && - * <CYAN>master<RESET> + * <CYAN>main<RESET> <BLUE>other<RESET> - <YELLOW>remotes/origin/master<RESET> + <YELLOW>remotes/origin/main<RESET> EOF git branch --color -a >actual.raw && test_decode_color <actual.raw >actual && |