Merge branch 'zh/ref-filter-push-remote-fix'

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

diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 529ca556c8b4a097c0430d365b883f1d47ac824d..1537aa21798b669e30c0dbdc0d72aa3465c141b6 100755 (executable)
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -2,11 +2,15 @@
 
 test_description='test for-each-refs usage of ref-filter APIs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
 test_expect_success 'setup some history and refs' '
        test_commit one &&
+       git branch -M main &&
        test_commit two &&
        test_commit three &&
        git checkout -b side &&
@@ -26,17 +30,17 @@ test_expect_success 'setup some history and refs' '
        git tag $sign -m "A signed tag" signed-tag &&
        git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
 
-       git checkout master &&
-       git update-ref refs/odd/spot master
+       git checkout main &&
+       git update-ref refs/odd/spot main
 '
 
 test_expect_success 'filtering with --points-at' '
        cat >expect <<-\EOF &&
-       refs/heads/master
+       refs/heads/main
        refs/odd/spot
        refs/tags/three
        EOF
-       git for-each-ref --format="%(refname)" --points-at=master >actual &&
+       git for-each-ref --format="%(refname)" --points-at=main >actual &&
        test_cmp expect actual
 '
 
@@ -53,13 +57,13 @@ test_expect_success 'check signed tags with --points-at' '
 
 test_expect_success 'filtering with --merged' '
        cat >expect <<-\EOF &&
-       refs/heads/master
+       refs/heads/main
        refs/odd/spot
        refs/tags/one
        refs/tags/three
        refs/tags/two
        EOF
-       git for-each-ref --format="%(refname)" --merged=master >actual &&
+       git for-each-ref --format="%(refname)" --merged=main >actual &&
        test_cmp expect actual
 '
 
@@ -72,13 +76,13 @@ test_expect_success 'filtering with --no-merged' '
        refs/tags/four
        refs/tags/signed-tag
        EOF
-       git for-each-ref --format="%(refname)" --no-merged=master >actual &&
+       git for-each-ref --format="%(refname)" --no-merged=main >actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'filtering with --contains' '
        cat >expect <<-\EOF &&
-       refs/heads/master
+       refs/heads/main
        refs/heads/side
        refs/odd/spot
        refs/tags/annotated-tag
@@ -134,7 +138,7 @@ test_expect_success '%(color:#aa22ac) must succeed' '
 
 test_expect_success 'left alignment is default' '
        cat >expect <<-\EOF &&
-       refname is refs/heads/master  |refs/heads/master
+       refname is refs/heads/main    |refs/heads/main
        refname is refs/heads/side    |refs/heads/side
        refname is refs/odd/spot      |refs/odd/spot
        refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -152,7 +156,7 @@ test_expect_success 'left alignment is default' '
 
 test_expect_success 'middle alignment' '
        cat >expect <<-\EOF &&
-       | refname is refs/heads/master |refs/heads/master
+       |  refname is refs/heads/main  |refs/heads/main
        |  refname is refs/heads/side  |refs/heads/side
        |   refname is refs/odd/spot   |refs/odd/spot
        |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -170,7 +174,7 @@ test_expect_success 'middle alignment' '
 
 test_expect_success 'right alignment' '
        cat >expect <<-\EOF &&
-       |  refname is refs/heads/master|refs/heads/master
+       |    refname is refs/heads/main|refs/heads/main
        |    refname is refs/heads/side|refs/heads/side
        |      refname is refs/odd/spot|refs/odd/spot
        |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -187,7 +191,7 @@ test_expect_success 'right alignment' '
 '
 
 cat >expect <<-\EOF
-|       refname is refs/heads/master       |refs/heads/master
+|        refname is refs/heads/main        |refs/heads/main
 |        refname is refs/heads/side        |refs/heads/side
 |         refname is refs/odd/spot         |refs/odd/spot
 |    refname is refs/tags/annotated-tag    |refs/tags/annotated-tag
@@ -234,7 +238,7 @@ EOF
 
 test_expect_success 'alignment with format quote' "
        cat >expect <<-\EOF &&
-       |'      '\''master| A U Thor'\''      '|
+       |'       '\''main| A U Thor'\''       '|
        |'       '\''side| A U Thor'\''       '|
        |'     '\''odd/spot| A U Thor'\''     '|
        |'      '\''annotated-tag| '\''       '|
@@ -252,7 +256,7 @@ test_expect_success 'alignment with format quote' "
 
 test_expect_success 'nested alignment with quote formatting' "
        cat >expect <<-\EOF &&
-       |'         master               '|
+       |'           main               '|
        |'           side               '|
        |'       odd/spot               '|
        |'  annotated-tag               '|
@@ -270,7 +274,7 @@ test_expect_success 'nested alignment with quote formatting' "
 
 test_expect_success 'check `%(contents:lines=1)`' '
        cat >expect <<-\EOF &&
-       master |three
+       main |three
        side |four
        odd/spot |three
        annotated-tag |An annotated tag
@@ -288,7 +292,7 @@ test_expect_success 'check `%(contents:lines=1)`' '
 
 test_expect_success 'check `%(contents:lines=0)`' '
        cat >expect <<-\EOF &&
-       master |
+       main |
        side |
        odd/spot |
        annotated-tag |
@@ -306,7 +310,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
 
 test_expect_success 'check `%(contents:lines=99999)`' '
        cat >expect <<-\EOF &&
-       master |three
+       main |three
        side |four
        odd/spot |three
        annotated-tag |An annotated tag
@@ -379,7 +383,7 @@ test_expect_success 'improper usage of %(if), %(then), %(else) and %(end) atoms'
 test_expect_success 'check %(if)...%(then)...%(end) atoms' '
        git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Author: %(authorname)%(end)" >actual &&
        cat >expect <<-\EOF &&
-       refs/heads/master Author: A U Thor
+       refs/heads/main Author: A U Thor
        refs/heads/side Author: A U Thor
        refs/odd/spot Author: A U Thor
        refs/tags/annotated-tag
@@ -400,7 +404,7 @@ test_expect_success 'check %(if)...%(then)...%(end) atoms' '
 test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
        git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
        cat >expect <<-\EOF &&
-       A U Thor: refs/heads/master
+       A U Thor: refs/heads/main
        A U Thor: refs/heads/side
        A U Thor: refs/odd/spot
        No author: refs/tags/annotated-tag
@@ -420,7 +424,7 @@ test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
 test_expect_success 'ignore spaces in %(if) atom usage' '
        git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
        cat >expect <<-\EOF &&
-       master: Head ref
+       main: Head ref
        side: Not Head ref
        odd/spot: Not Head ref
        annotated-tag: Not Head ref
@@ -439,34 +443,34 @@ test_expect_success 'ignore spaces in %(if) atom usage' '
 '
 
 test_expect_success 'check %(if:equals=<string>)' '
-       git for-each-ref --format="%(if:equals=master)%(refname:short)%(then)Found master%(else)Not master%(end)" refs/heads/ >actual &&
+       git for-each-ref --format="%(if:equals=main)%(refname:short)%(then)Found main%(else)Not main%(end)" refs/heads/ >actual &&
        cat >expect <<-\EOF &&
-       Found master
-       Not master
+       Found main
+       Not main
        EOF
        test_cmp expect actual
 '
 
 test_expect_success 'check %(if:notequals=<string>)' '
-       git for-each-ref --format="%(if:notequals=master)%(refname:short)%(then)Not master%(else)Found master%(end)" refs/heads/ >actual &&
+       git for-each-ref --format="%(if:notequals=main)%(refname:short)%(then)Not main%(else)Found main%(end)" refs/heads/ >actual &&
        cat >expect <<-\EOF &&
-       Found master
-       Not master
+       Found main
+       Not main
        EOF
        test_cmp expect actual
 '
 
-test_expect_success '--merged is incompatible with --no-merged' '
-       test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
+test_expect_success '--merged is compatible with --no-merged' '
+       git for-each-ref --merged HEAD --no-merged HEAD
 '
 
 test_expect_success 'validate worktree atom' '
        cat >expect <<-EOF &&
-       master: $(pwd)
-       master_worktree: $(pwd)/worktree_dir
+       main: $(pwd)
+       main_worktree: $(pwd)/worktree_dir
        side: not checked out
        EOF
-       git worktree add -b master_worktree worktree_dir master &&
+       git worktree add -b main_worktree worktree_dir main &&
        git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
        rm -r worktree_dir &&
        git worktree prune &&