Merge branch 'maint-1.6.6' into maint

diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 297ddb5a25b682412851aed70370771aa5a15976..9bdf6596d82878f709a375084095697124a97609 100755 (executable)
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -4,6 +4,12 @@ test_description='typechange rename detection'
 
 . ./test-lib.sh
 
+if ! test_have_prereq SYMLINKS
+then
+       say 'Symbolic links not supported, skipping tests.'
+       test_done
+fi
+
 test_expect_success setup '
 
        rm -f foo bar &&