Merge branch 'zh/difftool-skip-to'

[thirdparty/git.git] / t / t5617-clone-submodules-remote.sh

diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh
index 1a041df10bee558bf4b643f42d4ffa876fefbc14..e2dbb4eabae2aa141b3b1d5a1a5b0e4cdd9d0e65 100755 (executable)
--- a/t/t5617-clone-submodules-remote.sh
+++ b/t/t5617-clone-submodules-remote.sh
@@ -2,12 +2,15 @@
 
 test_description='Test cloning repos with submodules using remote-tracking branches'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pwd=$(pwd)
 
 test_expect_success 'setup' '
-       git checkout -b master &&
+       git checkout -b main &&
        test_commit commit1 &&
        mkdir sub &&
        (
@@ -39,7 +42,7 @@ test_expect_success 'clone with --remote-submodules' '
        git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
        (
                cd super_clone/sub &&
-               git diff --exit-code remotes/origin/master
+               git diff --exit-code remotes/origin/main
        )
 '
 
@@ -57,7 +60,7 @@ test_expect_success 'clone with --single-branch' '
        git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
        (
                cd super_clone/sub &&
-               git rev-parse --verify origin/master &&
+               git rev-parse --verify origin/main &&
                test_must_fail git rev-parse --verify origin/other
        )
 '