Merge branch 'jk/fetch-reflog-df-conflict'

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 7674dd2ec9d6f14a0f2181ebf415378521f90fa4..872fcda6cb6dce98ec360c41cb6ae1220193ca48 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -9,18 +9,16 @@ test_description='git apply symlinks and partial files
 
 . ./test-lib.sh
 
-test_expect_success SYMLINKS setup '
+test_expect_success setup '
 
-       ln -s path1/path2/path3/path4/path5 link1 &&
-       git add link? &&
+       test_ln_s_add path1/path2/path3/path4/path5 link1 &&
        git commit -m initial &&
 
        git branch side &&
 
        rm -f link? &&
 
-       ln -s htap6 link1 &&
-       git update-index link? &&
+       test_ln_s_add htap6 link1 &&
        git commit -m second &&
 
        git diff-tree -p HEAD^ HEAD >patch  &&
@@ -37,7 +35,7 @@ test_expect_success SYMLINKS 'apply symlink patch' '
 
 '
 
-test_expect_success SYMLINKS 'apply --index symlink patch' '
+test_expect_success 'apply --index symlink patch' '
 
        git checkout -f side &&
        git apply --index patch &&