Merge branch 'zh/difftool-skip-to'

[thirdparty/git.git] / t / t4048-diff-combined-binary.sh

diff --git a/t/t4048-diff-combined-binary.sh b/t/t4048-diff-combined-binary.sh
index 7f9ad9fa3d1f97b9aeedbb0c1d351be5749837ee..0260cf64f5d5507eb53fde74fba88d9d3a9ab3b4 100755 (executable)
--- a/t/t4048-diff-combined-binary.sh
+++ b/t/t4048-diff-combined-binary.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='combined and merge diff handle binary files and textconv'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup binary merge conflict' '
@@ -14,7 +17,7 @@ test_expect_success 'setup binary merge conflict' '
        echo threeQ3 | q_to_nul >binary &&
        git commit -a -m three &&
        three=$(git rev-parse --short HEAD:binary) &&
-       test_must_fail git merge master &&
+       test_must_fail git merge main &&
        echo resolvedQhooray | q_to_nul >binary &&
        git commit -a -m resolved &&
        res=$(git rev-parse --short HEAD:binary)
@@ -62,14 +65,14 @@ test_expect_success 'diff --cc indicates binary-ness' '
 '
 
 test_expect_success 'setup non-binary with binary attribute' '
-       git checkout master &&
+       git checkout main &&
        test_commit one text &&
        test_commit two text &&
        two=$(git rev-parse --short HEAD:text) &&
        git checkout -b branch-text HEAD^ &&
        test_commit three text &&
        three=$(git rev-parse --short HEAD:text) &&
-       test_must_fail git merge master &&
+       test_must_fail git merge main &&
        test_commit resolved text &&
        res=$(git rev-parse --short HEAD:text) &&
        echo text -diff >.gitattributes
@@ -206,11 +209,11 @@ index $three,$two..0000000
  +THREE
 ++=======
 + TWO
-++>>>>>>> MASTER
+++>>>>>>> MAIN
 EOF
 test_expect_success 'diff --cc respects textconv on worktree file' '
        git reset --hard HEAD^ &&
-       test_must_fail git merge master &&
+       test_must_fail git merge main &&
        git diff >actual &&
        test_cmp expect actual
 '