diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
commit | 883b98efade212bf1496a93dd8a691355a31daf0 (patch) | |
tree | 5a9c67eb117e5840725328bbfae9714d3b8e5eb0 /t/t2401-worktree-prune.sh | |
parent | 06d531486e9078c88c324ad6f87376cfa897f058 (diff) |
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/t2401-worktree-prune.sh')
-rwxr-xr-x | t/t2401-worktree-prune.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh index e6fc27de1e..aff877590d 100755 --- a/t/t2401-worktree-prune.sh +++ b/t/t2401-worktree-prune.sh @@ -2,7 +2,7 @@ test_description='prune $GIT_DIR/worktrees' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -90,7 +90,7 @@ test_expect_success 'not prune recent checkouts' ' test_expect_success 'not prune proper checkouts' ' test_when_finished rm -r .git/worktrees && - git worktree add --detach "$PWD/nop" master && + git worktree add --detach "$PWD/nop" main && git worktree prune && test -d .git/worktrees/nop ' |