diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:23 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
commit | d6c6b10817409ed93d3c1f65b3d0d2b0875165d4 (patch) | |
tree | 5a9990c3ab13c2a91abc705199c79f1ec030690d /t/t3320-notes-merge-worktrees.sh | |
parent | 883b98efade212bf1496a93dd8a691355a31daf0 (diff) |
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/t3320-notes-merge-worktrees.sh')
-rwxr-xr-x | t/t3320-notes-merge-worktrees.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index f86975414c..052516e6c6 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -5,7 +5,7 @@ test_description='Test merging of notes trees in multiple 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 @@ -39,8 +39,8 @@ test_expect_success 'modify notes ref ourselves (x)' ' ' test_expect_success 'create some new worktrees' ' - git worktree add -b newbranch worktree master && - git worktree add -b newbranch2 worktree2 master + git worktree add -b newbranch worktree main && + git worktree add -b newbranch2 worktree2 main ' test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' ' |