Merge branch 'jk/rev-list-disk-usage'

[thirdparty/git.git] / t / t4017-diff-retval.sh

diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index 95a7ca707045cad3362b92c18df73e82206a2844..ed461f481e2af5e3d73ac628eeee1fb52218d90b 100755 (executable)
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -2,6 +2,9 @@
 
 test_description='Return value of diffs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -111,7 +114,7 @@ test_expect_success 'check detects leftover conflict markers' '
        git checkout HEAD^ &&
        echo binary >>b &&
        git commit -m "side" b &&
-       test_must_fail git merge master &&
+       test_must_fail git merge main &&
        git add b &&
        test_expect_code 2 git --no-pager diff --cached --check >test.out &&
        test 3 = $(grep "conflict marker" test.out | wc -l) &&