Merge branch 'jk/log-cherry-pick-duplicate-patches'

[thirdparty/git.git] / t / t6007-rev-list-cherry-pick-file.sh

diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 8bf5ae23c2ac350b43bfa66ffd01db2731531e53..aebe4b69e13ea56444dc760cb1b6058702f2d241 100755 (executable)
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -2,6 +2,9 @@
 
 test_description='test git rev-list --cherry-pick -- file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # A---B---D---F
@@ -31,7 +34,7 @@ test_expect_success setup '
        test_tick &&
        git commit -m "E" &&
        git tag E &&
-       git checkout master &&
+       git checkout main &&
        git checkout branch foo &&
        test_tick &&
        git commit -m "B" &&
@@ -233,7 +236,7 @@ test_expect_success '--cherry-pick with independent, but identical branches' '
        test_tick &&
        git commit -m "independent, too" foo &&
        test -z "$(git rev-list --left-right --cherry-pick \
-               HEAD...master -- foo)"
+               HEAD...main -- foo)"
 '
 
 cat >expect <<EOF