Merge branch 'js/default-branch-name-tests-final-stretch'

[thirdparty/git.git] / t / t6300-for-each-ref.sh

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index b03740d6343c5757154cc82316699be5f314afa3..ca62e764b58683239d8b118bff4d9a4b7cf63314 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -31,12 +31,13 @@ test_expect_success setup '
        echo "Using $datestamp" > one &&
        git add one &&
        git commit -m "Initial" &&
+       git branch -M main &&
        setdate_and_increment &&
        git tag -a -m "Tagging at $datestamp" testtag &&
-       git update-ref refs/remotes/origin/master master &&
+       git update-ref refs/remotes/origin/main main &&
        git remote add origin nowhere &&
-       git config branch.master.remote origin &&
-       git config branch.master.merge refs/heads/master &&
+       git config branch.main.remote origin &&
+       git config branch.main.merge refs/heads/main &&
        git remote add myfork elsewhere &&
        git config remote.pushdefault myfork &&
        git config push.default current
@@ -44,7 +45,7 @@ test_expect_success setup '
 
 test_atom() {
        case "$1" in
-               head) ref=refs/heads/master ;;
+               head) ref=refs/heads/main ;;
                 tag) ref=refs/tags/testtag ;;
                 sym) ref=refs/heads/sym ;;
                   *) ref=$1 ;;
@@ -79,49 +80,49 @@ test_atom() {
 hexlen=$(test_oid hexsz)
 disklen=$(test_oid disklen)
 
-test_atom head refname refs/heads/master
-test_atom head refname: refs/heads/master
-test_atom head refname:short master
-test_atom head refname:lstrip=1 heads/master
-test_atom head refname:lstrip=2 master
-test_atom head refname:lstrip=-1 master
-test_atom head refname:lstrip=-2 heads/master
+test_atom head refname refs/heads/main
+test_atom head refname: refs/heads/main
+test_atom head refname:short main
+test_atom head refname:lstrip=1 heads/main
+test_atom head refname:lstrip=2 main
+test_atom head refname:lstrip=-1 main
+test_atom head refname:lstrip=-2 heads/main
 test_atom head refname:rstrip=1 refs/heads
 test_atom head refname:rstrip=2 refs
 test_atom head refname:rstrip=-1 refs
 test_atom head refname:rstrip=-2 refs/heads
-test_atom head refname:strip=1 heads/master
-test_atom head refname:strip=2 master
-test_atom head refname:strip=-1 master
-test_atom head refname:strip=-2 heads/master
-test_atom head upstream refs/remotes/origin/master
-test_atom head upstream:short origin/master
-test_atom head upstream:lstrip=2 origin/master
-test_atom head upstream:lstrip=-2 origin/master
+test_atom head refname:strip=1 heads/main
+test_atom head refname:strip=2 main
+test_atom head refname:strip=-1 main
+test_atom head refname:strip=-2 heads/main
+test_atom head upstream refs/remotes/origin/main
+test_atom head upstream:short origin/main
+test_atom head upstream:lstrip=2 origin/main
+test_atom head upstream:lstrip=-2 origin/main
 test_atom head upstream:rstrip=2 refs/remotes
 test_atom head upstream:rstrip=-2 refs/remotes
-test_atom head upstream:strip=2 origin/master
-test_atom head upstream:strip=-2 origin/master
-test_atom head push refs/remotes/myfork/master
-test_atom head push:short myfork/master
-test_atom head push:lstrip=1 remotes/myfork/master
-test_atom head push:lstrip=-1 master
+test_atom head upstream:strip=2 origin/main
+test_atom head upstream:strip=-2 origin/main
+test_atom head push refs/remotes/myfork/main
+test_atom head push:short myfork/main
+test_atom head push:lstrip=1 remotes/myfork/main
+test_atom head push:lstrip=-1 main
 test_atom head push:rstrip=1 refs/remotes/myfork
 test_atom head push:rstrip=-1 refs
-test_atom head push:strip=1 remotes/myfork/master
-test_atom head push:strip=-1 master
+test_atom head push:strip=1 remotes/myfork/main
+test_atom head push:strip=-1 main
 test_atom head objecttype commit
 test_atom head objectsize $((131 + hexlen))
 test_atom head objectsize:disk $disklen
 test_atom head deltabase $ZERO_OID
-test_atom head objectname $(git rev-parse refs/heads/master)
-test_atom head objectname:short $(git rev-parse --short refs/heads/master)
-test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
-test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
-test_atom head tree $(git rev-parse refs/heads/master^{tree})
-test_atom head tree:short $(git rev-parse --short refs/heads/master^{tree})
-test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/master^{tree})
-test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/master^{tree})
+test_atom head objectname $(git rev-parse refs/heads/main)
+test_atom head objectname:short $(git rev-parse --short refs/heads/main)
+test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
+test_atom head tree $(git rev-parse refs/heads/main^{tree})
+test_atom head tree:short $(git rev-parse --short refs/heads/main^{tree})
+test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/main^{tree})
+test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/main^{tree})
 test_atom head parent ''
 test_atom head parent:short ''
 test_atom head parent:short=1 ''
@@ -174,8 +175,8 @@ test_atom tag deltabase $ZERO_OID
 test_atom tag '*deltabase' $ZERO_OID
 test_atom tag objectname $(git rev-parse refs/tags/testtag)
 test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag)
-test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
-test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
+test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
 test_atom tag tree ''
 test_atom tag tree:short ''
 test_atom tag tree:short=1 ''
@@ -256,7 +257,7 @@ test_date () {
        author_date=$3 &&
        tagger_date=$4 &&
        cat >expected <<-EOF &&
-       'refs/heads/master' '$committer_date' '$author_date'
+       'refs/heads/main' '$committer_date' '$author_date'
        'refs/tags/testtag' '$tagger_date'
        EOF
        (
@@ -378,8 +379,8 @@ test_expect_success 'exercise strftime with odd fields' '
 '
 
 cat >expected <<\EOF
-refs/heads/master
-refs/remotes/origin/master
+refs/heads/main
+refs/remotes/origin/main
 refs/tags/testtag
 EOF
 
@@ -391,8 +392,8 @@ test_expect_success 'Verify ascending sort' '
 
 cat >expected <<\EOF
 refs/tags/testtag
-refs/remotes/origin/master
-refs/heads/master
+refs/remotes/origin/main
+refs/heads/main
 EOF
 
 test_expect_success 'Verify descending sort' '
@@ -427,8 +428,8 @@ test_expect_success 'exercise glob patterns with prefixes' '
 '
 
 cat >expected <<\EOF
-'refs/heads/master'
-'refs/remotes/origin/master'
+'refs/heads/main'
+'refs/remotes/origin/main'
 'refs/tags/testtag'
 EOF
 
@@ -448,8 +449,8 @@ test_expect_success 'Quoting style: python' '
 '
 
 cat >expected <<\EOF
-"refs/heads/master"
-"refs/remotes/origin/master"
+"refs/heads/main"
+"refs/remotes/origin/main"
 "refs/tags/testtag"
 EOF
 
@@ -476,8 +477,8 @@ test_atom head upstream:nobracket,track 'ahead 1'
 
 test_expect_success 'setup for push:track[short]' '
        test_commit third &&
-       git update-ref refs/remotes/myfork/master master &&
-       git reset master~1
+       git update-ref refs/remotes/myfork/main main &&
+       git reset main~1
 '
 
 test_atom head push:track '[behind 1]'
@@ -493,8 +494,8 @@ test_expect_success 'Check that :track[short] works when upstream is invalid' '
        [gone]
 
        EOF
-       test_when_finished "git config branch.master.merge refs/heads/master" &&
-       git config branch.master.merge refs/heads/does-not-exist &&
+       test_when_finished "git config branch.main.merge refs/heads/main" &&
+       git config branch.main.merge refs/heads/does-not-exist &&
        git for-each-ref \
                --format="%(upstream:track)$LF%(upstream:trackshort)" \
                refs/heads >actual &&
@@ -507,9 +508,9 @@ test_expect_success 'Check for invalid refname format' '
 
 test_expect_success 'set up color tests' '
        cat >expected.color <<-EOF &&
-       $(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
-       $(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET>
-       $(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
+       $(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
+       $(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
+       $(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
        $(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
        $(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
        $(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
@@ -541,8 +542,8 @@ test_expect_success 'color.ui=always does not override tty check' '
 '
 
 cat >expected <<\EOF
-heads/master
-tags/master
+heads/main
+tags/main
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs (strict)' '
@@ -552,19 +553,19 @@ test_expect_success 'Check ambiguous head and tag refs (strict)' '
        git add one &&
        git commit -m "Branch" &&
        setdate_and_increment &&
-       git tag -m "Tagging at $datestamp" master &&
-       git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+       git tag -m "Tagging at $datestamp" main &&
+       git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
        test_cmp expected actual
 '
 
 cat >expected <<\EOF
-heads/master
-master
+heads/main
+main
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs (loose)' '
        git config --bool core.warnambiguousrefs false &&
-       git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+       git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
        test_cmp expected actual
 '
 
@@ -574,7 +575,7 @@ ambiguous
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs II (loose)' '
-       git checkout master &&
+       git checkout main &&
        git tag ambiguous testtag^0 &&
        git branch ambiguous testtag^0 &&
        git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
@@ -708,8 +709,8 @@ body contents
 $sig"
 
 test_expect_success 'set up refs pointing to tree and blob' '
-       git update-ref refs/mytrees/first refs/heads/master^{tree} &&
-       git update-ref refs/myblobs/first refs/heads/master:one
+       git update-ref refs/mytrees/first refs/heads/main^{tree} &&
+       git update-ref refs/myblobs/first refs/heads/main:one
 '
 
 test_atom refs/mytrees/first subject ""
@@ -781,7 +782,7 @@ test_expect_success 'equivalent sorts fall back on refname' '
 '
 
 test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
-       test_when_finished "git checkout master" &&
+       test_when_finished "git checkout main" &&
        git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
        sed -e "s/^\* /  /" actual >expect &&
        git checkout --orphan orphaned-branch &&
@@ -818,9 +819,9 @@ test_expect_success '%(trailers:unfold) unfolds trailers' '
                unfold <trailers
                echo
        } >expect &&
-       git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
+       git for-each-ref --format="%(trailers:unfold)" refs/heads/main >actual &&
        test_cmp expect actual &&
-       git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
+       git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/main >actual &&
        test_cmp expect actual
 '
 
@@ -829,9 +830,9 @@ test_expect_success '%(trailers:only) shows only "key: value" trailers' '
                grep -v patch.description <trailers &&
                echo
        } >expect &&
-       git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
+       git for-each-ref --format="%(trailers:only)" refs/heads/main >actual &&
        test_cmp expect actual &&
-       git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
+       git for-each-ref --format="%(contents:trailers:only)" refs/heads/main >actual &&
        test_cmp expect actual
 '
 
@@ -840,13 +841,13 @@ test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
                grep -v patch.description <trailers | unfold &&
                echo
        } >expect &&
-       git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
+       git for-each-ref --format="%(trailers:only,unfold)" refs/heads/main >actual &&
        test_cmp expect actual &&
-       git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >actual &&
+       git for-each-ref --format="%(trailers:unfold,only)" refs/heads/main >actual &&
        test_cmp actual actual &&
-       git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
+       git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/main >actual &&
        test_cmp expect actual &&
-       git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >actual &&
+       git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/main >actual &&
        test_cmp actual actual
 '
 
@@ -870,7 +871,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
 '
 
 test_expect_success 'basic atom: head contents:trailers' '
-       git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
+       git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
        sanitize_pgp <actual >actual.clean &&
        # git for-each-ref ends with a blank line
        cat >expect <<-EOF &&
@@ -899,16 +900,16 @@ test_expect_success 'trailer parsing not fooled by --- line' '
                echo "trailer: right" &&
                echo
        } >expect &&
-       git for-each-ref --format="%(trailers)" refs/heads/master >actual &&
+       git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'Add symbolic ref for the following tests' '
-       git symbolic-ref refs/heads/sym refs/heads/master
+       git symbolic-ref refs/heads/sym refs/heads/main
 '
 
 cat >expected <<EOF
-refs/heads/master
+refs/heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref) atom' '
@@ -917,7 +918,7 @@ test_expect_success 'Verify usage of %(symref) atom' '
 '
 
 cat >expected <<EOF
-heads/master
+heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref:short) atom' '
@@ -926,8 +927,8 @@ test_expect_success 'Verify usage of %(symref:short) atom' '
 '
 
 cat >expected <<EOF
-master
-heads/master
+main
+heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref:lstrip) atom' '
@@ -956,22 +957,23 @@ test_expect_success ':remotename and :remoteref' '
        (
                cd remote-tests &&
                test_commit initial &&
+               git branch -M main &&
                git remote add from fifth.coffee:blub &&
-               git config branch.master.remote from &&
-               git config branch.master.merge refs/heads/stable &&
+               git config branch.main.remote from &&
+               git config branch.main.merge refs/heads/stable &&
                git remote add to southridge.audio:repo &&
                git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
-               git config branch.master.pushRemote to &&
+               git config branch.main.pushRemote to &&
                for pair in "%(upstream)=refs/remotes/from/stable" \
                        "%(upstream:remotename)=from" \
                        "%(upstream:remoteref)=refs/heads/stable" \
-                       "%(push)=refs/remotes/to/pushed/master" \
+                       "%(push)=refs/remotes/to/pushed/main" \
                        "%(push:remotename)=to" \
-                       "%(push:remoteref)=refs/heads/pushed/master"
+                       "%(push:remoteref)=refs/heads/pushed/main"
                do
                        echo "${pair#*=}" >expect &&
                        git for-each-ref --format="${pair%=*}" \
-                               refs/heads/master >actual &&
+                               refs/heads/main >actual &&
                        test_cmp expect actual
                done &&
                git branch push-simple &&
@@ -984,12 +986,12 @@ test_expect_success ':remotename and :remoteref' '
 '
 
 test_expect_success 'for-each-ref --ignore-case ignores case' '
-       git for-each-ref --format="%(refname)" refs/heads/MASTER >actual &&
+       git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
        test_must_be_empty actual &&
 
-       echo refs/heads/master >expect &&
+       echo refs/heads/main >expect &&
        git for-each-ref --format="%(refname)" --ignore-case \
-               refs/heads/MASTER >actual &&
+               refs/heads/MAIN >actual &&
        test_cmp expect actual
 '