Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index 135614890419363d9cc0e3dce1912b6178f793f4..570d3729bd2312a8d9cf90f3d2e1121a58f43de6 100755 (executable)
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -177,7 +177,7 @@ test_expect_success 'funny symlink in work tree' '
 
 '
 
-test_expect_failure 'funny symlink in work tree, un-unlink-able' '
+test_expect_success 'funny symlink in work tree, un-unlink-able' '
 
        rm -fr a b &&
        git reset --hard &&