X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4006-diff-mode.sh;h=8ad69d11155f3a3df9a5508a07ccd78ba7e5d747;hb=476d23980417ea0b476735d1ad971f9b66b4e032;hp=e2a67e9633811453c1b5c63d9936728e62e4585e;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index e2a67e96..8ad69d11 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -15,11 +15,21 @@ test_expect_success \
      tree=`git-write-tree` &&
      echo $tree'
 
-test_expect_success \
-    'chmod' \
-    'chmod +x rezrov &&
-     git-update-index rezrov &&
-     git-diff-index $tree >current'
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+	say 'filemode disabled on the filesystem, using update-index --chmod=+x'
+	test_expect_success \
+	    'git-update-index --chmod=+x' \
+	    'git-update-index rezrov &&
+	     git-update-index --chmod=+x rezrov &&
+	     git-diff-index $tree >current'
+else
+	test_expect_success \
+	    'chmod' \
+	    'chmod +x rezrov &&
+	     git-update-index rezrov &&
+	     git-diff-index $tree >current'
+fi
 
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"