diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:22 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 883b98efade212bf1496a93dd8a691355a31daf0 (patch) | |
| tree | 5a9c67eb117e5840725328bbfae9714d3b8e5eb0 /t/t2015-checkout-unborn.sh | |
| parent | t[01]*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-883b98efade212bf1496a93dd8a691355a31daf0.tar.xz | |
t2*: adjust the references to the default branch name "main"
Carefully excluding t2106, 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' -- t2*.sh &&
git checkout HEAD -- t2106\*)
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/t2015-checkout-unborn.sh')
| -rwxr-xr-x | t/t2015-checkout-unborn.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh index 669a70c76f..a9721215fa 100755 --- a/t/t2015-checkout-unborn.sh +++ b/t/t2015-checkout-unborn.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='checkout from unborn branch' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -14,7 +14,7 @@ test_expect_success 'setup' ' git add file && git commit -m base ) && - git fetch parent master:origin + git fetch parent main:origin ' test_expect_success 'checkout from unborn preserves untracked files' ' |