Merge branch 'ew/rebase'

diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index 530cc4d2a38c6f4af92097dfe524029ef6a3a6bf..fbb508d389e078263d983bf6736df8f1a0fe7b5d 100755 (executable)
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -31,7 +31,12 @@ test_expect_success setup \
 test_expect_success apply \
     'git-apply --index --stat --summary --apply test-patch'
 
-test_expect_success validate \
-    'test -f bar && ls -l bar | grep "^-..x..x..x"'
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+       say 'filemode disabled on the filesystem'
+else
+       test_expect_success validate \
+           'test -f bar && ls -l bar | grep "^-..x......"'
+fi
 
 test_done