Merge branch 'es/maintenance-of-bare-repositories'

[thirdparty/git.git] / t / t3403-rebase-skip.sh

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index a927774910bc058a9d661e59b1670f4fd043fc5f..e26762d0b29400f687df390d0b8e4c52e6f3bba0 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -5,6 +5,9 @@
 
 test_description='git rebase --merge --skip tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
@@ -48,7 +51,7 @@ test_expect_success setup '
        '
 
 test_expect_success 'rebase with git am -3 (default)' '
-       test_must_fail git rebase master
+       test_must_fail git rebase main
 '
 
 test_expect_success 'rebase --skip can not be used with other options' '
@@ -64,7 +67,7 @@ test_expect_success 'rebase moves back to skip-reference' '
        test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
        git branch post-rebase &&
        git reset --hard pre-rebase &&
-       test_must_fail git rebase master &&
+       test_must_fail git rebase main &&
        echo "hello" > hello &&
        git add hello &&
        git rebase --continue &&
@@ -75,7 +78,7 @@ test_expect_success 'rebase moves back to skip-reference' '
 test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
 
 test_expect_success 'rebase with --merge' '
-       test_must_fail git rebase --merge master
+       test_must_fail git rebase --merge main
 '
 
 test_expect_success 'rebase --skip with --merge' '