Merge branch 'lt/logopt' into next

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index beb6d8f4877c157bdf9e3efa2c914e74da863cd5..67b9681d36e187a5717acbf9fe00a7f5dfd5bb65 100755 (executable)
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -26,6 +26,14 @@ rm -f path1
 test_expect_success \
     'git-diff-files -p after editing work tree.' \
     'git-diff-files -p >current'
+
+# that's as far as it comes
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+       say 'filemode disabled on the filesystem'
+       test_done
+fi
+
 cat >expected <<\EOF
 diff --git a/path0 b/path0
 old mode 100644