diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
| commit | 883b98efade212bf1496a93dd8a691355a31daf0 (patch) | |
| tree | 5a9c67eb117e5840725328bbfae9714d3b8e5eb0 /t/t2030-unresolve-info.sh | |
| parent | 06d531486e9078c88c324ad6f87376cfa897f058 (diff) | |
| download | git-883b98efade212bf1496a93dd8a691355a31daf0.zip git-883b98efade212bf1496a93dd8a691355a31daf0.tar.gz git-883b98efade212bf1496a93dd8a691355a31daf0.tar.bz2 | |
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/t2030-unresolve-info.sh')
| -rwxr-xr-x | t/t2030-unresolve-info.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh index 3fe29fc..be6c84c 100755 --- a/t/t2030-unresolve-info.sh +++ b/t/t2030-unresolve-info.sh @@ -2,7 +2,7 @@ test_description='undoing resolution' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -62,7 +62,7 @@ test_expect_success setup ' test_commit fourth fi/le fourth && git checkout add-add && test_commit fifth add-differently && - git checkout master + git checkout main ' test_expect_success 'add records switch clears' ' @@ -186,8 +186,8 @@ test_expect_success 'rerere forget (binary)' ' ' test_expect_success 'rerere forget (add-add conflict)' ' - git checkout -f master && - echo master >add-differently && + git checkout -f main && + echo main >add-differently && git add add-differently && git commit -m "add differently" && test_must_fail git merge fifth && |