Merge branch 'maint'

diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 37c9a9f254d626939ef28398ec15bec606a9c588..0d3c1d5dd5c0f35f9cc44eab4fcba5ba2e36ddd7 100755 (executable)
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -3,6 +3,12 @@
 test_description='apply to deeper directory without getting fooled with symlink'
 . ./test-lib.sh
 
+if ! test_have_prereq SYMLINKS
+then
+       say 'Symbolic links not supported, skipping tests.'
+       test_done
+fi
+
 lecho () {
        for l_
        do
@@ -34,7 +40,6 @@ test_expect_success setup '
 test_expect_success apply '
 
        git checkout test &&
-       git reset --hard && #### checkout seems to be buggy
        git diff --exit-code test &&
        git diff --exit-code --cached test &&
        git apply --index test.patch
@@ -54,4 +59,3 @@ test_expect_success 'check result' '
 '
 
 test_done
-