t7[0-4]*: adjust the references to the default branch name "main"

Carefully excluding t7064, which sees independent development elsewhere
at the time of writing, we use `main` as the default branch name in
t7[0-4]*. This trick was performed via

	$ (cd t &&
	   sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
		-e 's/Master/Main/g' -- t7[0-4]*.sh &&
	   git checkout HEAD -- t7064\*)

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>

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index db496fa0391cd8014efe6d1308acdbe062679754..1c556950346f0cfcf145991cea6fe34f37a300b6 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='git filter-branch'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -16,7 +16,7 @@ test_expect_success 'setup' '
        mkdir dir &&
        test_commit dir/D &&
        test_commit E &&
-       git checkout master &&
+       git checkout main &&
        test_commit C &&
        git checkout branch &&
        git merge C &&
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 # * G
 # *   Merge commit 'C' into branch
 # |\
-# | * (master) C
+# | * (main) C
 # * | E
 # * | dir/D
 # * | D
@@ -165,15 +165,15 @@ test_expect_success 'subdirectory filter result looks okay' '
 '
 
 test_expect_success 'more setup' '
-       git checkout master &&
+       git checkout main &&
        mkdir subdir &&
        echo A > subdir/new &&
        git add subdir/new &&
        test_tick &&
-       git commit -m "subdir on master" subdir/new &&
+       git commit -m "subdir on main" subdir/new &&
        git rm A.t &&
        test_tick &&
-       git commit -m "again subdir on master" &&
+       git commit -m "again subdir on main" &&
        git merge branch
 '
 
@@ -202,7 +202,7 @@ test_expect_success 'author information is preserved' '
        git branch preserved-author &&
        (sane_unset GIT_AUTHOR_NAME &&
         git filter-branch -f --msg-filter "cat; \
-                       test \$GIT_COMMIT != $(git rev-parse master) || \
+                       test \$GIT_COMMIT != $(git rev-parse main) || \
                        echo Hallo" \
                preserved-author) &&
        git rev-list --author="B V Uips" preserved-author >actual &&
@@ -221,7 +221,7 @@ test_expect_success "remove a certain author's commits" '
                else\
                        git commit-tree \"\$@\";\
                fi" removed-author &&
-       cnt1=$(git rev-list master | wc -l) &&
+       cnt1=$(git rev-list main | wc -l) &&
        cnt2=$(git rev-list removed-author | wc -l) &&
        test $cnt1 -eq $(($cnt2 + 1)) &&
        git rev-list --author="B V Uips" removed-author >actual &&
@@ -229,7 +229,7 @@ test_expect_success "remove a certain author's commits" '
 '
 
 test_expect_success 'barf on invalid name' '
-       test_must_fail git filter-branch -f master xy-problem &&
+       test_must_fail git filter-branch -f main xy-problem &&
        test_must_fail git filter-branch -f HEAD^
 '
 
@@ -239,8 +239,8 @@ test_expect_success '"map" works in commit filter' '
                mapped=\$(map \$parent) &&
                actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
                test \$mapped = \$actual &&
-               git commit-tree \"\$@\";" master~2..master &&
-       git rev-parse --verify master
+               git commit-tree \"\$@\";" main~2..main &&
+       git rev-parse --verify main
 '
 
 test_expect_success 'Name needing quotes' '
@@ -259,7 +259,7 @@ test_expect_success 'Name needing quotes' '
 
 test_expect_success 'Subdirectory filter with disappearing trees' '
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
 
        mkdir foo &&
        touch foo/bar &&
@@ -278,7 +278,7 @@ test_expect_success 'Subdirectory filter with disappearing trees' '
        git commit -m "Re-adding foo" &&
 
        git filter-branch -f --subdirectory-filter foo &&
-       git rev-list master >actual &&
+       git rev-list main >actual &&
        test_line_count = 3 actual
 '
 
@@ -335,7 +335,7 @@ test_expect_success 'Tag name filtering allows slashes in tag names' '
        test_cmp expect actual
 '
 test_expect_success 'setup --prune-empty comparisons' '
-       git checkout --orphan master-no-a &&
+       git checkout --orphan main-no-a &&
        git rm -rf . &&
        unset test_tick &&
        test_tick &&
@@ -346,7 +346,7 @@ test_expect_success 'setup --prune-empty comparisons' '
        mkdir dir &&
        test_commit dir/D dir/D.t dir/D dir/Dx &&
        test_commit E E.t E Ex &&
-       git checkout master-no-a &&
+       git checkout main-no-a &&
        test_commit C C.t C Cx &&
        git checkout branch-no-a &&
        git merge Cx -m "Merge tag '\''C'\'' into branch" &&
@@ -400,7 +400,7 @@ test_expect_success '--prune-empty is able to prune entire branch' '
 '
 
 test_expect_success '--remap-to-ancestor with filename filters' '
-       git checkout master &&
+       git checkout main &&
        git reset --hard A &&
        test_commit add-foo foo 1 &&
        git branch moved-foo &&
@@ -410,15 +410,15 @@ test_expect_success '--remap-to-ancestor with filename filters' '
        git branch moved-bar &&
        test_commit change-foo foo 2 &&
        git filter-branch -f --remap-to-ancestor \
-               moved-foo moved-bar A..master \
+               moved-foo moved-bar A..main \
                -- -- foo &&
        test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
-       test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
+       test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
        test $orig_invariant = $(git rev-parse invariant)
 '
 
 test_expect_success 'automatic remapping to ancestor with filename filters' '
-       git checkout master &&
+       git checkout main &&
        git reset --hard A &&
        test_commit add-foo2 foo 1 &&
        git branch moved-foo2 &&
@@ -428,10 +428,10 @@ test_expect_success 'automatic remapping to ancestor with filename filters' '
        git branch moved-bar2 &&
        test_commit change-foo2 foo 2 &&
        git filter-branch -f \
-               moved-foo2 moved-bar2 A..master \
+               moved-foo2 moved-bar2 A..main \
                -- -- foo &&
        test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
-       test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
+       test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
        test $orig_invariant = $(git rev-parse invariant2)
 '
 

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 0e3086c4a64c79abf30ab12bd0f782f8ef317150..943a7d5c1db9563eb8ed648f0f760a54b9df58eb 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -7,7 +7,7 @@ test_description='git tag
 
 Tests for operations with tags.'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -1586,7 +1586,7 @@ test_expect_success 'checking that branch head with --no-contains lists all but
 "
 
 test_expect_success 'merging original branch into this branch' '
-       git merge --strategy=ours master &&
+       git merge --strategy=ours main &&
         git tag v4.0
 '
 
@@ -1947,15 +1947,15 @@ test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a de
        i=1 &&
        while test $i -lt 8000
        do
-               echo "commit refs/heads/master
+               echo "commit refs/heads/main
 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 data <<EOF
 commit #$i
 EOF"
-               test $i = 1 && echo "from refs/heads/master^0"
+               test $i = 1 && echo "from refs/heads/main^0"
                i=$(($i + 1))
        done | git fast-import &&
-       git checkout master &&
+       git checkout main &&
        git tag far-far-away HEAD^ &&
        run_with_limited_stack git tag --contains HEAD >actual &&
        test_must_be_empty actual &&

diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index bcb3c4f0350ec2cd478b73ebec2b6a4c24c386d4..3cefde9602bf73b7be1a457556d0d11713a47e4f 100755 (executable)
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='signed tag tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -20,7 +20,7 @@ test_expect_success GPG 'create signed tags' '
        echo 3 >elif && git add elif &&
        test_tick && git commit -m "third on side" &&
 
-       git checkout master &&
+       git checkout main &&
        test_tick && git merge -S side &&
        git tag -s -m merge merge &&
 

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index e65ca019eb02f7b2e5d80a2bfcda780e964fa84e..72fb418b8904ffedac1fcf87d97878c86e054b5b 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -2,7 +2,7 @@
 
 test_description='basic work tree status reporting'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -54,7 +54,7 @@ EOF
                git checkout -b side HEAD^ &&
                git rm foo &&
                git commit -m delete &&
-               test_must_fail git merge master &&
+               test_must_fail git merge main &&
                test_must_fail git commit --dry-run >../actual &&
                test_i18ncmp ../expect ../actual &&
                git status >../actual &&
@@ -127,18 +127,18 @@ test_expect_success 'git diff-index --cached -C shows 2 copies + 1 unmerged' '
 
 test_expect_success 'status when conflicts with add and rm advice (deleted by them)' '
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
        test_commit init main.txt init &&
        git checkout -b second_branch &&
        git rm main.txt &&
        git commit -m "main.txt deleted on second_branch" &&
        test_commit second conflict.txt second &&
-       git checkout master &&
+       git checkout main &&
        test_commit on_second main.txt on_second &&
-       test_commit master conflict.txt master &&
+       test_commit main conflict.txt main &&
        test_must_fail git merge second_branch &&
        cat >expected <<\EOF &&
-On branch master
+On branch main
 You have unmerged paths.
   (fix conflicts and run "git commit")
   (use "git merge --abort" to abort the merge)
@@ -160,8 +160,8 @@ test_expect_success 'prepare for conflicts' '
        git checkout -b conflict &&
        test_commit one main.txt one &&
        git branch conflict_second &&
-       git mv main.txt sub_master.txt &&
-       git commit -m "main.txt renamed in sub_master.txt" &&
+       git mv main.txt sub_main.txt &&
+       git commit -m "main.txt renamed in sub_main.txt" &&
        git checkout conflict_second &&
        git mv main.txt sub_second.txt &&
        git commit -m "main.txt renamed in sub_second.txt"
@@ -179,7 +179,7 @@ You have unmerged paths.
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
        both deleted:    main.txt
-       added by them:   sub_master.txt
+       added by them:   sub_main.txt
        added by us:     sub_second.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")
@@ -192,7 +192,7 @@ EOF
 test_expect_success 'status when conflicts with only rm advice (both deleted)' '
        git reset --hard conflict_second &&
        test_must_fail git merge conflict &&
-       git add sub_master.txt &&
+       git add sub_main.txt &&
        git add sub_second.txt &&
        cat >expected <<\EOF &&
 On branch conflict_second
@@ -201,7 +201,7 @@ You have unmerged paths.
   (use "git merge --abort" to abort the merge)
 
 Changes to be committed:
-       new file:   sub_master.txt
+       new file:   sub_main.txt
 
 Unmerged paths:
   (use "git rm <file>..." to mark resolution)
@@ -212,12 +212,12 @@ EOF
        git status --untracked-files=no >actual &&
        test_i18ncmp expected actual &&
        git reset --hard &&
-       git checkout master
+       git checkout main
 '
 
 test_expect_success 'status --branch with detached HEAD' '
        git reset --hard &&
-       git checkout master^0 &&
+       git checkout main^0 &&
        git status --branch --porcelain >actual &&
        cat >expected <<-EOF &&
        ## HEAD (no branch)
@@ -233,7 +233,7 @@ test_expect_success 'status --branch with detached HEAD' '
 ## Duplicate the above test and verify --porcelain=v1 arg parsing.
 test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
        git reset --hard &&
-       git checkout master^0 &&
+       git checkout main^0 &&
        git status --branch --porcelain=v1 >actual &&
        cat >expected <<-EOF &&
        ## HEAD (no branch)

diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index ae60942347796d2d3786522d8946e26829cccd48..f01bf27727905db64f5d7eeaca5fd05b5e90f02f 100755 (executable)
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -2,7 +2,7 @@
 
 test_description='test untracked cache'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -478,7 +478,7 @@ EOF
 test_expect_success 'set up sparse checkout' '
        echo "done/[a-z]*" >.git/info/sparse-checkout &&
        test_config core.sparsecheckout true &&
-       git checkout master &&
+       git checkout main &&
        git update-index --force-untracked-cache &&
        git status --porcelain >/dev/null && # prime the cache
        test_path_is_missing done/.gitignore &&
@@ -737,13 +737,13 @@ test_expect_success 'test ident field is working' '
 test_expect_success 'untracked cache survives a checkout' '
        git commit --allow-empty -m empty &&
        test-tool dump-untracked-cache >../before &&
-       test_when_finished  "git checkout master" &&
+       test_when_finished  "git checkout main" &&
        git checkout -b other_branch &&
        test-tool dump-untracked-cache >../after &&
        test_cmp ../before ../after &&
        test_commit test &&
        test-tool dump-untracked-cache >../before &&
-       git checkout master &&
+       git checkout main &&
        test-tool dump-untracked-cache >../after &&
        test_cmp ../before ../after
 '
@@ -778,7 +778,7 @@ test_expect_success SYMLINKS '"status" after symlink replacement should be clean
        git checkout HEAD~ &&
        status_is_clean &&
        status_is_clean &&
-       git checkout master &&
+       git checkout main &&
        avoid_racy &&
        status_is_clean &&
        status_is_clean
@@ -789,7 +789,7 @@ test_expect_success SYMLINKS '"status" after symlink replacement should be clean
        git checkout HEAD~ &&
        status_is_clean &&
        status_is_clean &&
-       git checkout master &&
+       git checkout main &&
        avoid_racy &&
        status_is_clean &&
        status_is_clean
@@ -813,7 +813,7 @@ test_expect_success '"status" after file replacement should be clean with UC=tru
        git checkout HEAD~ &&
        status_is_clean &&
        status_is_clean &&
-       git checkout master &&
+       git checkout main &&
        avoid_racy &&
        status_is_clean &&
        test-tool dump-untracked-cache >../actual &&
@@ -831,7 +831,7 @@ test_expect_success '"status" after file replacement should be clean with UC=fal
        git checkout HEAD~ &&
        status_is_clean &&
        status_is_clean &&
-       git checkout master &&
+       git checkout main &&
        avoid_racy &&
        status_is_clean &&
        status_is_clean

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 4af43d26f1f4eff803ba9f8748e04240e98753b2..7d8fb188ee5eb914cc77e30846191adb78adb5bb 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -7,7 +7,7 @@ test_description='git reset
 
 Documented tests for git reset'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -148,7 +148,7 @@ test_expect_success 'trying to do reset --soft with pending merge should fail' '
        printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
        git commit -a -m "the change in branch2" &&
 
-       git checkout master &&
+       git checkout main &&
        git branch -D branch1 branch2 &&
        check_changes $head5
 '
@@ -170,7 +170,7 @@ test_expect_success 'trying to do reset --soft with pending checkout merge shoul
        printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
        git commit -a -m "the line in branch3" &&
 
-       git checkout master &&
+       git checkout main &&
        git branch -D branch3 branch4 &&
        check_changes $head5
 '
@@ -383,7 +383,7 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
        git reset --hard ORIG_HEAD &&
        check_changes $head5 &&
 
-       git checkout master &&
+       git checkout main &&
        git branch -D branch1 branch2 &&
        check_changes $head5
 '

diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
index 8872c32f942eb06e2caa469d2d2c9d71948a0ea0..688fa995c9164b7e58c6ac81cafa949b07d68199 100755 (executable)
--- a/t/t7113-post-index-change-hook.sh
+++ b/t/t7113-post-index-change-hook.sh
@@ -2,7 +2,7 @@
 
 test_description='post index change hook'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -88,7 +88,7 @@ test_expect_success 'test checkout and reset trigger the hook' '
        EOF
        : force index to be dirty &&
        test-tool chmtime +60 dir1/file1.txt &&
-       git checkout master &&
+       git checkout main &&
        test_path_is_file testsuccess && rm -f testsuccess &&
        test_path_is_missing testfailure &&
        test-tool chmtime +60 dir1/file1.txt &&

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 12567543c42571613f3d4f261f7cb8b75c222592..daf8678b8a5f3f485b8424d04b6f45f165a35dab 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -5,10 +5,10 @@
 
 test_description='git checkout tests.
 
-Creates master, forks renamer and side branches from it.
+Creates main, forks renamer and side branches from it.
 Test switching across them.
 
-  ! [master] Initial A one, A two
+  ! [main] Initial A one, A two
    * [renamer] Renamer R one->uno, M two
     ! [side] Side M one, D two, A three
      ! [simple] Simple D one, M two
@@ -16,11 +16,11 @@ Test switching across them.
      + [simple] Simple D one, M two
     +  [side] Side M one, D two, A three
    *   [renamer] Renamer R one->uno, M two
-  +*++ [master] Initial A one, A two
+  +*++ [main] Initial A one, A two
 
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -49,27 +49,27 @@ test_expect_success setup '
        fill a b c d e f >two &&
        git commit -a -m "Renamer R one->uno, M two" &&
 
-       git checkout -b side master &&
+       git checkout -b side main &&
        fill 1 2 3 4 5 6 7 >one &&
        fill A B C D E >three &&
        rm -f two &&
        git update-index --add --remove one two three &&
        git commit -m "Side M one, D two, A three" &&
 
-       git checkout -b simple master &&
+       git checkout -b simple main &&
        rm -f one &&
        fill a c e >two &&
        git commit -a -m "Simple D one, M two" &&
 
-       git checkout master
+       git checkout main
 '
 
 test_expect_success 'checkout from non-existing branch' '
-       git checkout -b delete-me master &&
+       git checkout -b delete-me main &&
        git update-ref -d --no-deref refs/heads/delete-me &&
        test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-       git checkout master &&
-       test refs/heads/master = "$(git symbolic-ref HEAD)"
+       git checkout main &&
+       test refs/heads/main = "$(git symbolic-ref HEAD)"
 '
 
 test_expect_success 'checkout with dirty tree without -m' '
@@ -84,7 +84,7 @@ test_expect_success 'checkout with dirty tree without -m' '
 '
 
 test_expect_success 'checkout with unrelated dirty tree without -m' '
-       git checkout -f master &&
+       git checkout -f main &&
        fill 0 1 2 3 4 5 6 7 8 >same &&
        cp same kept &&
        git checkout side >messages &&
@@ -94,7 +94,7 @@ test_expect_success 'checkout with unrelated dirty tree without -m' '
 '
 
 test_expect_success 'checkout -m with dirty tree' '
-       git checkout -f master &&
+       git checkout -f main &&
        git clean -f &&
 
        fill 0 1 2 3 4 5 6 7 8 >one &&
@@ -105,9 +105,9 @@ test_expect_success 'checkout -m with dirty tree' '
        printf "M\t%s\n" one >expect.messages &&
        test_cmp expect.messages messages &&
 
-       fill "M one" "A three" "D       two" >expect.master &&
-       git diff --name-status master >current.master &&
-       test_cmp expect.master current.master &&
+       fill "M one" "A three" "D       two" >expect.main &&
+       git diff --name-status main >current.main &&
+       test_cmp expect.main current.main &&
 
        fill "M one" >expect.side &&
        git diff --name-status side >current.side &&
@@ -118,7 +118,7 @@ test_expect_success 'checkout -m with dirty tree' '
 '
 
 test_expect_success 'checkout -m with dirty tree, renamed' '
-       git checkout -f master && git clean -f &&
+       git checkout -f main && git clean -f &&
 
        fill 1 2 3 4 5 7 8 >one &&
        if git checkout renamer
@@ -138,7 +138,7 @@ test_expect_success 'checkout -m with dirty tree, renamed' '
 '
 
 test_expect_success 'checkout -m with merge conflict' '
-       git checkout -f master && git clean -f &&
+       git checkout -f main && git clean -f &&
 
        fill 1 T 3 4 5 6 S 8 >one &&
        if git checkout renamer
@@ -151,7 +151,7 @@ test_expect_success 'checkout -m with merge conflict' '
 
        git checkout -m renamer &&
 
-       git diff master:one :3:uno |
+       git diff main:one :3:uno |
        sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
        fill d2 aT d7 aS >expect &&
        test_cmp expect current &&
@@ -160,7 +160,7 @@ test_expect_success 'checkout -m with merge conflict' '
 '
 
 test_expect_success 'format of merge conflict from checkout -m' '
-       git checkout -f master &&
+       git checkout -f main &&
        git clean -f &&
 
        fill b d >two &&
@@ -184,7 +184,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
 '
 
 test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
-       git checkout -f master &&
+       git checkout -f main &&
        git reset --hard &&
        git clean -f &&
 
@@ -196,7 +196,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
        a
        c
        e
-       ||||||| master
+       ||||||| main
        a
        b
        c
@@ -211,7 +211,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
 '
 
 test_expect_success 'switch to another branch while carrying a deletion' '
-       git checkout -f master &&
+       git checkout -f main &&
        git reset --hard &&
        git clean -f &&
        git rm two &&
@@ -232,7 +232,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
        test_i18ngrep "HEAD is now at $rev" messages &&
        test_line_count = 1 messages &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        if git symbolic-ref HEAD >/dev/null 2>&1
        then
@@ -252,7 +252,7 @@ test_expect_success 'checkout to detach HEAD' '
        grep "HEAD is now at $rev" messages &&
        test_line_count -gt 1 messages &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        if git symbolic-ref HEAD >/dev/null 2>&1
        then
@@ -264,11 +264,11 @@ test_expect_success 'checkout to detach HEAD' '
 '
 
 test_expect_success 'checkout to detach HEAD with branchname^' '
-       git checkout -f master &&
+       git checkout -f main &&
        git clean -f &&
        git checkout renamer^ &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        if git symbolic-ref HEAD >/dev/null 2>&1
        then
@@ -280,11 +280,11 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
 '
 
 test_expect_success 'checkout to detach HEAD with :/message' '
-       git checkout -f master &&
+       git checkout -f main &&
        git clean -f &&
        git checkout ":/Initial" &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        if git symbolic-ref HEAD >/dev/null 2>&1
        then
@@ -296,11 +296,11 @@ test_expect_success 'checkout to detach HEAD with :/message' '
 '
 
 test_expect_success 'checkout to detach HEAD with HEAD^0' '
-       git checkout -f master &&
+       git checkout -f main &&
        git clean -f &&
        git checkout HEAD^0 &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        if git symbolic-ref HEAD >/dev/null 2>&1
        then
@@ -313,13 +313,13 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
 
 test_expect_success 'checkout with ambiguous tag/branch names' '
        git tag both side &&
-       git branch both master &&
+       git branch both main &&
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
 
        git checkout both &&
        H=$(git rev-parse --verify HEAD) &&
-       M=$(git show-ref -s --verify refs/heads/master) &&
+       M=$(git show-ref -s --verify refs/heads/main) &&
        test "z$H" = "z$M" &&
        name=$(git symbolic-ref HEAD 2>/dev/null) &&
        test "z$name" = zrefs/heads/both
@@ -327,12 +327,12 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
 
 test_expect_success 'checkout with ambiguous tag/branch names' '
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
 
        git tag frotz side &&
-       git branch frotz master &&
+       git branch frotz main &&
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
 
        git checkout tags/frotz &&
        H=$(git rev-parse --verify HEAD) &&
@@ -349,7 +349,7 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
 
 test_expect_success 'switch branches while in subdirectory' '
        git reset --hard &&
-       git checkout master &&
+       git checkout main &&
 
        mkdir subs &&
        git -C subs checkout side &&
@@ -365,7 +365,7 @@ test_expect_success 'checkout specific path while in subdirectory' '
        git add subs/bero &&
        git commit -m "add subs/bero" &&
 
-       git checkout master &&
+       git checkout main &&
        mkdir -p subs &&
        git -C subs checkout side -- bero &&
        test -f subs/bero
@@ -373,7 +373,7 @@ test_expect_success 'checkout specific path while in subdirectory' '
 
 test_expect_success 'checkout w/--track sets up tracking' '
     git config branch.autosetupmerge false &&
-    git checkout master &&
+    git checkout main &&
     git checkout --track -b track1 &&
     test "$(git config branch.track1.remote)" &&
     test "$(git config branch.track1.merge)"
@@ -382,40 +382,40 @@ test_expect_success 'checkout w/--track sets up tracking' '
 test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
     test_when_finished git config branch.autosetupmerge false &&
     git config branch.autosetupmerge always &&
-    git checkout master &&
+    git checkout main &&
     git checkout -b track2 &&
     test "$(git config branch.track2.remote)" &&
     test "$(git config branch.track2.merge)"
 '
 
 test_expect_success 'checkout w/--track from non-branch HEAD fails' '
-    git checkout master^0 &&
+    git checkout main^0 &&
     test_must_fail git symbolic-ref HEAD &&
     test_must_fail git checkout --track -b track &&
     test_must_fail git rev-parse --verify track &&
     test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+    test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 '
 
 test_expect_success 'checkout w/--track from tag fails' '
-    git checkout master^0 &&
+    git checkout main^0 &&
     test_must_fail git symbolic-ref HEAD &&
     test_must_fail git checkout --track -b track frotz &&
     test_must_fail git rev-parse --verify track &&
     test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+    test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 '
 
 test_expect_success 'detach a symbolic link HEAD' '
-    git checkout master &&
+    git checkout main &&
     git config --bool core.prefersymlinkrefs yes &&
     git checkout side &&
-    git checkout master &&
+    git checkout main &&
     it=$(git symbolic-ref HEAD) &&
-    test "z$it" = zrefs/heads/master &&
-    here=$(git rev-parse --verify refs/heads/master) &&
+    test "z$it" = zrefs/heads/main &&
+    here=$(git rev-parse --verify refs/heads/main) &&
     git checkout side^ &&
-    test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
+    test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
 '
 
 test_expect_success 'checkout with --track fakes a sensible -b <name>' '
@@ -426,13 +426,13 @@ test_expect_success 'checkout with --track fakes a sensible -b <name>' '
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
     test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-    git checkout master && git branch -D koala/bear &&
+    git checkout main && git branch -D koala/bear &&
 
     git checkout --track refs/remotes/origin/koala/bear &&
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
     test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-    git checkout master && git branch -D koala/bear &&
+    git checkout main && git branch -D koala/bear &&
 
     git checkout --track remotes/origin/koala/bear &&
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
@@ -585,17 +585,17 @@ test_expect_success 'checkout --conflict=diff3' '
 '
 
 test_expect_success 'failing checkout -b should not break working tree' '
-       git reset --hard master &&
-       git symbolic-ref HEAD refs/heads/master &&
+       git reset --hard main &&
+       git symbolic-ref HEAD refs/heads/main &&
        test_must_fail git checkout -b renamer side^ &&
-       test $(git symbolic-ref HEAD) = refs/heads/master &&
+       test $(git symbolic-ref HEAD) = refs/heads/main &&
        git diff --exit-code &&
        git diff --cached --exit-code
 '
 
 test_expect_success 'switch out of non-branch' '
-       git reset --hard master &&
-       git checkout master^0 &&
+       git reset --hard main &&
+       git checkout main^0 &&
        echo modified >one &&
        test_must_fail git checkout renamer 2>error.log &&
        ! grep "^Previous HEAD" error.log

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 8addc0c8c9d077bb11d95f3e4f8f74b0cb9c505a..d44f69629337f7e617d118e060550737ca92c59a 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -9,7 +9,7 @@ This test tries to verify basic sanity of the init, update and status
 subcommands of git submodule.
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -127,7 +127,7 @@ inspect() {
 }
 
 test_expect_success 'submodule add' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -226,7 +226,7 @@ test_expect_success 'submodule add --branch' '
        echo "refs/heads/initial" >expect-head &&
        cat <<-\EOF >expect-heads &&
        refs/heads/initial
-       refs/heads/master
+       refs/heads/main
        EOF
 
        (
@@ -244,7 +244,7 @@ test_expect_success 'submodule add --branch' '
 '
 
 test_expect_success 'submodule add with ./ in path' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -260,7 +260,7 @@ test_expect_success 'submodule add with ./ in path' '
 '
 
 test_expect_success 'submodule add with /././ in path' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -276,7 +276,7 @@ test_expect_success 'submodule add with /././ in path' '
 '
 
 test_expect_success 'submodule add with // in path' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -292,7 +292,7 @@ test_expect_success 'submodule add with // in path' '
 '
 
 test_expect_success 'submodule add with /.. in path' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -308,7 +308,7 @@ test_expect_success 'submodule add with /.. in path' '
 '
 
 test_expect_success 'submodule add with ./, /.. and // in path' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        (
                cd addtest &&
@@ -338,7 +338,7 @@ test_expect_success !CYGWIN 'submodule add with \\ in path' '
 '
 
 test_expect_success 'submodule add in subdirectory' '
-       echo "refs/heads/master" >expect &&
+       echo "refs/heads/main" >expect &&
 
        mkdir addtest/sub &&
        (
@@ -560,7 +560,7 @@ test_expect_success 'status should be "up-to-date" after update' '
 
 test_expect_success 'checkout superproject with subproject already present' '
        git checkout initial &&
-       git checkout master
+       git checkout main
 '
 
 test_expect_success 'apply submodule diff' '
@@ -577,7 +577,7 @@ test_expect_success 'apply submodule diff' '
        git checkout second &&
        git apply --index P.diff &&
 
-       git diff --cached master >staged &&
+       git diff --cached main >staged &&
        test_must_be_empty staged
 '
 

diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index c95559bed5d5417430bdc2663f4b79bb6198ae77..7d2ac3322b50cc580d2212f40658cdda66204a16 100755 (executable)
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -8,7 +8,7 @@ test_description='git submodule sync
 These tests exercise the "git submodule sync" subcommand.
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -81,7 +81,7 @@ test_expect_success 'change submodule url' '
        (
                cd super &&
                cd submodule &&
-               git checkout master &&
+               git checkout main &&
                git pull
        ) &&
        mv submodule moved-submodule &&
@@ -115,7 +115,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
        )" &&
        (
                cd super-clone/submodule &&
-               git checkout master &&
+               git checkout main &&
                git pull
        ) &&
        (
@@ -143,7 +143,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
        )" &&
        (
                cd super-clone/submodule/sub-submodule &&
-               git checkout master &&
+               git checkout main &&
                git pull
        )
 '
@@ -171,7 +171,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
        )" &&
        (
                cd super-clone/submodule &&
-               git checkout master &&
+               git checkout main &&
                git pull
        ) &&
        (
@@ -202,7 +202,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
        )" &&
        (
                cd super-clone/submodule/sub-submodule &&
-               git checkout master &&
+               git checkout main &&
                git pull
        )
 '

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 825b1a7e0cc341157dc8e8e82d9b9b26c26675ba..b9c1624fba9fda209f7e86b3a2703624f3d63bc8 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -9,7 +9,7 @@ This test verifies that "git submodule update" detaches the HEAD of the
 submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -17,10 +17,10 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 compare_head()
 {
-    sha_master=$(git rev-list --max-count=1 master)
+    sha_main=$(git rev-list --max-count=1 main)
     sha_head=$(git rev-list --max-count=1 HEAD)
 
-    test "$sha_master" = "$sha_head"
+    test "$sha_main" = "$sha_head"
 }
 
 
@@ -265,14 +265,14 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
                cd super &&
                git submodule update --remote --force submodule &&
                git -C submodule log -1 --oneline >actual &&
-               git -C ../submodule log -1 --oneline master >expect &&
+               git -C ../submodule log -1 --oneline main >expect &&
                test_cmp expect actual &&
                git checkout -b test-branch &&
                git submodule update --remote --force submodule &&
                git -C submodule log -1 --oneline >actual &&
                git -C ../submodule log -1 --oneline test-branch >expect &&
                test_cmp expect actual &&
-               git checkout master &&
+               git checkout main &&
                git branch -d test-branch &&
                git reset --hard HEAD^
        )
@@ -285,7 +285,7 @@ test_expect_success 'local config should override .gitmodules branch' '
         git add file &&
         test_tick &&
         git commit -m "upstream line5" &&
-        git checkout master
+        git checkout main
        ) &&
        (cd super &&
         git config submodule.submodule.branch test-branch &&
@@ -295,9 +295,9 @@ test_expect_success 'local config should override .gitmodules branch' '
        )
 '
 
-test_expect_success 'submodule update --rebase staying on master' '
+test_expect_success 'submodule update --rebase staying on main' '
        (cd super/submodule &&
-         git checkout master
+         git checkout main
        ) &&
        (cd super &&
         (cd submodule &&
@@ -309,7 +309,7 @@ test_expect_success 'submodule update --rebase staying on master' '
        )
 '
 
-test_expect_success 'submodule update --merge staying on master' '
+test_expect_success 'submodule update --merge staying on main' '
        (cd super/submodule &&
          git reset --hard HEAD~1
        ) &&
@@ -612,7 +612,7 @@ test_expect_success 'submodule update - update=none in .git/config' '
        (cd super &&
         git config submodule.submodule.update none &&
         (cd submodule &&
-         git checkout master &&
+         git checkout main &&
          compare_head
         ) &&
         git diff --name-only >out &&
@@ -632,7 +632,7 @@ test_expect_success 'submodule update - update=none in .git/config but --checkou
        (cd super &&
         git config submodule.submodule.update none &&
         (cd submodule &&
-         git checkout master &&
+         git checkout main &&
          compare_head
         ) &&
         git diff --name-only >out &&
@@ -692,7 +692,7 @@ test_expect_success 'submodule update continues after checkout error' '
 test_expect_success 'submodule update continues after recursive checkout error' '
        (cd super &&
         git reset --hard HEAD &&
-        git checkout master &&
+        git checkout main &&
         git submodule update &&
         (cd submodule &&
          git submodule add ../submodule subsubmodule &&
@@ -736,7 +736,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
 
 test_expect_success 'submodule update exit immediately in case of merge conflict' '
        (cd super &&
-        git checkout master &&
+        git checkout main &&
         git reset --hard HEAD &&
         (cd submodule &&
          (cd subsubmodule &&
@@ -754,7 +754,7 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
         git add submodule2 &&
         git commit -m "two_new_submodule_commits" &&
         (cd submodule &&
-         git checkout master &&
+         git checkout main &&
          test_commit "conflict" file &&
          echo "conflict" > file
         ) &&
@@ -773,7 +773,7 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
 
 test_expect_success 'submodule update exit immediately after recursive rebase error' '
        (cd super &&
-        git checkout master &&
+        git checkout main &&
         git reset --hard HEAD &&
         (cd submodule &&
          git reset --hard HEAD &&
@@ -789,7 +789,7 @@ test_expect_success 'submodule update exit immediately after recursive rebase er
         git add submodule2 &&
         git commit -m "two_new_submodule_commits" &&
         (cd submodule &&
-         git checkout master &&
+         git checkout main &&
          test_commit "conflict2" file &&
          echo "conflict" > file
         ) &&
@@ -881,21 +881,21 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
        git clone subsubsuper_update_r subsubsuper_update_r2 &&
        (cd subsubsuper_update_r2 &&
         test_commit "update_subsubsuper" file &&
-        git push origin master
+        git push origin main
        ) &&
        git clone subsuper_update_r subsuper_update_r2 &&
        (cd subsuper_update_r2 &&
         test_commit "update_subsuper" file &&
         git submodule add ../subsubsuper_update_r subsubmodule &&
         git commit -am "subsubmodule" &&
-        git push origin master
+        git push origin main
        ) &&
        git clone super_update_r super_update_r2 &&
        (cd super_update_r2 &&
         test_commit "update_super" file &&
         git submodule add ../subsuper_update_r submodule &&
         git commit -am "submodule" &&
-        git push origin master
+        git push origin main
        ) &&
        rm -rf super_update_r2 &&
        git clone super_update_r super_update_r2 &&
@@ -914,7 +914,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
 
 test_expect_success 'submodule add properly re-creates deeper level submodules' '
        (cd super &&
-        git reset --hard master &&
+        git reset --hard main &&
         rm -rf deeper/ &&
         git submodule add --force ../submodule deeper/submodule
        )

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 632defc53bf9299e2d3f0937a900c1e4299553da..79981b51eb89aced1aaaeee9004bfeb6592af000 100755 (executable)
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -9,7 +9,7 @@ This test verifies that "git submodule foreach" correctly visits all submodules
 that are currently checked out.
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -280,13 +280,13 @@ sub1sha1_short=$(cd clone3/sub1 && git rev-parse --short HEAD)
 sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
 
 cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
- $nested2sha1 nested1/nested2 (heads/master)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested1sha1 nested1 (heads/main)
+ $nested2sha1 nested1/nested2 (heads/main)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
  $sub1sha1 sub1 ($sub1sha1_short)
  $sub2sha1 sub2 ($sub2sha1_short)
- $sub3sha1 sub3 (heads/master)
+ $sub3sha1 sub3 (heads/main)
 EOF
 
 test_expect_success 'test "status --recursive"' '
@@ -298,10 +298,10 @@ test_expect_success 'test "status --recursive"' '
 '
 
 cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
+ $nested1sha1 nested1 (heads/main)
 +$nested2sha1 nested1/nested2 (file2~1)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
 EOF
 
 test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
@@ -319,13 +319,13 @@ test_expect_success 'ensure "status --cached --recursive" preserves the --cached
 nested2sha1=$(git -C clone3/nested1/nested2 rev-parse HEAD)
 
 cat > expect <<EOF
- $nested1sha1 ../nested1 (heads/master)
+ $nested1sha1 ../nested1 (heads/main)
 +$nested2sha1 ../nested1/nested2 (file2)
- $nested3sha1 ../nested1/nested2/nested3 (heads/master)
- $submodulesha1 ../nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 ../nested1/nested2/nested3 (heads/main)
+ $submodulesha1 ../nested1/nested2/nested3/submodule (heads/main)
  $sub1sha1 ../sub1 ($sub1sha1_short)
  $sub2sha1 ../sub2 ($sub2sha1_short)
- $sub3sha1 ../sub3 (heads/master)
+ $sub3sha1 ../sub3 (heads/main)
 EOF
 
 test_expect_success 'test "status --recursive" from sub directory' '

diff --git a/t/t7409-submodule-detached-work-tree.sh b/t/t7409-submodule-detached-work-tree.sh
index e9428e2b593ec003bbef10d98543f8ddc914a515..e17ac81a893e329828c5bfe1458f4db1a2fb4841 100755 (executable)
--- a/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@ -10,7 +10,7 @@ on detached working trees
 '
 
 TEST_NO_CREATE_REPO=1
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -38,7 +38,7 @@ test_expect_success 'submodule on detached working tree' '
                        git rev-parse --verify HEAD >actual &&
                        test_cmp ../../../../expect actual
                ) &&
-               git push origin master
+               git push origin main
        ) &&
        mkdir home2 &&
        (
@@ -47,7 +47,7 @@ test_expect_success 'submodule on detached working tree' '
                GIT_WORK_TREE="$(pwd)" &&
                GIT_DIR="$(pwd)/.dotfiles" &&
                export GIT_WORK_TREE GIT_DIR &&
-               git checkout master &&
+               git checkout main &&
                git submodule update --init &&
                (
                        unset GIT_WORK_TREE GIT_DIR &&
@@ -67,10 +67,10 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
                git clone --bare ../remote "$GIT_DIR" &&
                git config core.bare false &&
                git config core.worktree .. &&
-               git checkout master &&
+               git checkout main &&
                git submodule add ../bundle1 .vim/bundle/dupe &&
                test_commit "dupe" &&
-               git push origin master
+               git push origin main
        ) &&
        (
                cd home &&

diff --git a/t/t7417-submodule-path-url.sh b/t/t7417-submodule-path-url.sh
index 0a514e951c564186d4c0b3d80ef66ffdd093173e..f0f6b9fa9e9a029bd8a17337beb402d1618ca948 100755 (executable)
--- a/t/t7417-submodule-path-url.sh
+++ b/t/t7417-submodule-path-url.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='check handling of .gitmodule path with dash'
-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,7 +39,7 @@ test_expect_success MINGW 'submodule paths disallows trailing spaces' '
        sed "s/sub/sub /" <tree >tree.new &&
        tree=$(git -C super mktree <tree.new) &&
        commit=$(echo with space | git -C super commit-tree $tree) &&
-       git -C super update-ref refs/heads/master $commit &&
+       git -C super update-ref refs/heads/main $commit &&
 
        test_must_fail git clone --recurse-submodules super dst 2>err &&
        test_i18ngrep "sub " err