Merge branch 'zh/difftool-skip-to'

[thirdparty/git.git] / t / t0041-usage.sh

diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh
index 5b927b76fe58e5284d7b74e2f9fd8cc0b1f07764..c4fc34eb18eb1401c5331667408c496e663c9c69 100755 (executable)
--- a/t/t0041-usage.sh
+++ b/t/t0041-usage.sh
@@ -2,6 +2,9 @@
 
 test_description='Test commands behavior when given invalid argument value'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup ' '
@@ -41,8 +44,8 @@ test_expect_success 'tag usage error' '
 '
 
 test_expect_success 'branch --contains <existent_commit>' '
-       git branch --contains "master" >actual 2>actual.err &&
-       test_i18ngrep "master" actual &&
+       git branch --contains "main" >actual 2>actual.err &&
+       test_i18ngrep "main" actual &&
        test_line_count = 0 actual.err
 '
 
@@ -54,7 +57,7 @@ test_expect_success 'branch --contains <inexistent_commit>' '
 '
 
 test_expect_success 'branch --no-contains <existent_commit>' '
-       git branch --no-contains "master" >actual 2>actual.err &&
+       git branch --no-contains "main" >actual 2>actual.err &&
        test_line_count = 0 actual &&
        test_line_count = 0 actual.err
 '
@@ -73,7 +76,7 @@ test_expect_success 'branch usage error' '
 '
 
 test_expect_success 'for-each-ref --contains <existent_object>' '
-       git for-each-ref --contains "master" >actual 2>actual.err &&
+       git for-each-ref --contains "main" >actual 2>actual.err &&
        test_line_count = 2 actual &&
        test_line_count = 0 actual.err
 '
@@ -86,7 +89,7 @@ test_expect_success 'for-each-ref --contains <inexistent_object>' '
 '
 
 test_expect_success 'for-each-ref --no-contains <existent_object>' '
-       git for-each-ref --no-contains "master" >actual 2>actual.err &&
+       git for-each-ref --no-contains "main" >actual 2>actual.err &&
        test_line_count = 0 actual &&
        test_line_count = 0 actual.err
 '