summaryrefslogtreecommitdiff
path: root/t/t6405-merge-symlinks.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6405-merge-symlinks.sh')
-rwxr-xr-xt/t6405-merge-symlinks.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6405-merge-symlinks.sh b/t/t6405-merge-symlinks.sh
index 6c0a90d044..140e9e6ce6 100755
--- a/t/t6405-merge-symlinks.sh
+++ b/t/t6405-merge-symlinks.sh
@@ -8,6 +8,9 @@ test_description='merging symlinks on filesystem w/o symlink support.
This tests that git merge-recursive writes merge results as plain files
if core.symlinks is false.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '