X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4006-diff-mode.sh;h=8ad69d11155f3a3df9a5508a07ccd78ba7e5d747;hb=376bb3a352d6512a318706c2fba5737ffd7cc92b;hp=90fd21ff1f0fd892b649e0b2fc73844e14cb0ee2;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 90fd21ff..8ad69d11 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -11,15 +11,25 @@ test_description='Test mode change diffs.
 test_expect_success \
     'setup' \
     'echo frotz >rezrov &&
-     git-update-cache --add rezrov &&
+     git-update-index --add rezrov &&
      tree=`git-write-tree` &&
      echo $tree'
 
-test_expect_success \
-    'chmod' \
-    'chmod +x rezrov &&
-     git-update-cache rezrov &&
-     git-diff-cache $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"