X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=t%2Ft4006-diff-mode.sh;h=4e92fce1d00a55cfbc39e55b53f95cc309e96ff2;hb=acd3b9eca82e38950f94e4708b528b7dae09a7c8;hp=e2a67e9633811453c1b5c63d9936728e62e4585e;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index e2a67e963..4e92fce1d 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-index --add rezrov &&
-     tree=`git-write-tree` &&
+     git update-index --add rezrov &&
+     tree=`git write-tree` &&
      echo $tree'
 
-test_expect_success \
-    'chmod' \
-    'chmod +x rezrov &&
-     git-update-index rezrov &&
-     git-diff-index $tree >current'
+if [ "$(git 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"
@@ -28,7 +38,6 @@ echo ":100644 100755 X X M	rezrov" >expected
 
 test_expect_success \
     'verify' \
-    'diff -u expected check'
+    'test_cmp expected check'
 
 test_done
-