t3905: remove nested git in command substitution

[thirdparty/git.git] / t / t3435-rebase-gpg-sign.sh

diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index 54120b09d6e9b6e29784393458671d715b06efc4..ec1076685802221f4ba89c75aa09b1283c48e2a9 100755 (executable)
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -5,6 +5,9 @@
 
 test_description='test rebase --[no-]gpg-sign'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-rebase.sh"
 . "$TEST_DIRECTORY/lib-gpg.sh"
@@ -46,7 +49,7 @@ test_expect_success 'setup: merge commit' '
        test_commit fork-point &&
        git switch -c side &&
        test_commit three &&
-       git switch master &&
+       git switch main &&
        git merge --no-ff side &&
        git tag merged
 '
@@ -64,7 +67,7 @@ test_rebase_gpg_sign   false -i --no-gpg-sign --gpg-sign
 test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
        git reset --hard merged &&
        git config commit.gpgsign true &&
-       git rebase -p --no-gpg-sign --onto=one fork-point master &&
+       git rebase -p --no-gpg-sign --onto=one fork-point main &&
        test_must_fail git verify-commit HEAD
 '