Merge branch 'ab/detox-gettext-tests'

[thirdparty/git.git] / t / t6439-merge-co-error-msgs.sh

diff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index 5c8894d94ff107b6ea9ca63226075fadf9501e55..5bfb027099a6d22849739075de82f3c0af7ca513 100755 (executable)
--- a/t/t6439-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -2,6 +2,9 @@
 
 test_description='unpack-trees error messages'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -18,7 +21,7 @@ test_expect_success 'setup' '
        git add two three four five &&
        git commit -m Second &&
 
-       git checkout master &&
+       git checkout main &&
        echo other >two &&
        echo other >three &&
        echo other >four &&
@@ -37,14 +40,14 @@ EOF
 
 test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
        test_must_fail git merge branch 2>out &&
-       test_i18ncmp out expect &&
+       test_cmp out expect &&
        git commit --allow-empty -m empty &&
        (
                GIT_MERGE_VERBOSITY=0 &&
                export GIT_MERGE_VERBOSITY &&
                test_must_fail git merge branch 2>out2
        ) &&
-       test_i18ncmp out2 expect &&
+       test_cmp out2 expect &&
        git reset --hard HEAD^
 '
 
@@ -65,7 +68,7 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
        git add three &&
        git add four &&
        test_must_fail git merge branch 2>out &&
-       test_i18ncmp out expect
+       test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -83,11 +86,11 @@ test_expect_success 'cannot switch branches because of local changes' '
        echo two >rep/two &&
        git add rep/one rep/two &&
        git commit -m Fourth &&
-       git checkout master &&
+       git checkout main &&
        echo uno >rep/one &&
        echo dos >rep/two &&
        test_must_fail git checkout branch 2>out &&
-       test_i18ncmp out expect
+       test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -101,7 +104,7 @@ EOF
 test_expect_success 'not uptodate file porcelain checkout error' '
        git add rep/one rep/two &&
        test_must_fail git checkout branch 2>out &&
-       test_i18ncmp out expect
+       test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -128,11 +131,11 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
        >rep2 &&
        git add rep rep2 &&
        git commit -m "added test as a file" &&
-       git checkout master &&
+       git checkout main &&
        >rep/untracked-file &&
        >rep2/untracked-file &&
        test_must_fail git checkout branch 2>out &&
-       test_i18ncmp out ../expect
+       test_cmp out ../expect
 '
 
 test_done