Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index f591a5681dc4ac4abe44cc04a488414481c98ac5..fbb508d389e078263d983bf6736df8f1a0fe7b5d 100755 (executable)
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -26,12 +26,17 @@ echo 'This is foo' >foo
 chmod +x foo
 
 test_expect_success setup \
-    'git-update-cache --add foo'
+    'git-update-index --add foo'
 
 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