Merge branch 'es/maintenance-of-bare-repositories'

[thirdparty/git.git] / t / t5523-push-upstream.sh

diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index e47b5db5d6603af4c63cf50a1aede28018ac564a..9fbe7f784d234af76f5616f0816f29c64bd0d379 100755 (executable)
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='push with --set-upstream'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -26,19 +29,19 @@ check_config() {
        test_cmp expect.$1 actual.$1
 }
 
-test_expect_success 'push -u master:master' '
-       git push -u upstream master:master &&
-       check_config master upstream refs/heads/master
+test_expect_success 'push -u main:main' '
+       git push -u upstream main:main &&
+       check_config main upstream refs/heads/main
 '
 
-test_expect_success 'push -u master:other' '
-       git push -u upstream master:other &&
-       check_config master upstream refs/heads/other
+test_expect_success 'push -u main:other' '
+       git push -u upstream main:other &&
+       check_config main upstream refs/heads/other
 '
 
-test_expect_success 'push -u --dry-run master:otherX' '
-       git push -u --dry-run upstream master:otherX &&
-       check_config master upstream refs/heads/other
+test_expect_success 'push -u --dry-run main:otherX' '
+       git push -u --dry-run upstream main:otherX &&
+       check_config main upstream refs/heads/other
 '
 
 test_expect_success 'push -u topic_2:topic_2' '
@@ -74,7 +77,7 @@ test_expect_success 'push -u HEAD' '
 test_expect_success TTY 'progress messages go to tty' '
        ensure_fresh_upstream &&
 
-       test_terminal git push -u upstream master >out 2>err &&
+       test_terminal git push -u upstream main >out 2>err &&
        test_i18ngrep "Writing objects" err
 '
 
@@ -82,7 +85,7 @@ test_expect_success 'progress messages do not go to non-tty' '
        ensure_fresh_upstream &&
 
        # skip progress messages, since stderr is non-tty
-       git push -u upstream master >out 2>err &&
+       git push -u upstream main >out 2>err &&
        test_i18ngrep ! "Writing objects" err
 '
 
@@ -90,21 +93,21 @@ test_expect_success 'progress messages go to non-tty (forced)' '
        ensure_fresh_upstream &&
 
        # force progress messages to stderr, even though it is non-tty
-       git push -u --progress upstream master >out 2>err &&
+       git push -u --progress upstream main >out 2>err &&
        test_i18ngrep "Writing objects" err
 '
 
 test_expect_success TTY 'push -q suppresses progress' '
        ensure_fresh_upstream &&
 
-       test_terminal git push -u -q upstream master >out 2>err &&
+       test_terminal git push -u -q upstream main >out 2>err &&
        test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'push --no-progress suppresses progress' '
        ensure_fresh_upstream &&
 
-       test_terminal git push -u --no-progress upstream master >out 2>err &&
+       test_terminal git push -u --no-progress upstream main >out 2>err &&
        test_i18ngrep ! "Unpacking objects" err &&
        test_i18ngrep ! "Writing objects" err
 '
@@ -112,7 +115,7 @@ test_expect_success TTY 'push --no-progress suppresses progress' '
 test_expect_success TTY 'quiet push' '
        ensure_fresh_upstream &&
 
-       test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output &&
+       test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
        test_must_be_empty output
 '