X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=t%2Ft4000-diff-format.sh;h=7d92ae3e996b31f8fa9e0b62f40a04ec1940cf70;hb=7e0f1704b837355d833d84d18a3811d145867b97;hp=3accb14f00b8d1b9cdcee1ca8eac34bd8e82e8ac;hpb=f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda;p=git.git

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 3accb14f0..7d92ae3e9 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -7,6 +7,7 @@ test_description='Test built-in diff output engine.
 
 '
 . ./test-lib.sh
+. ../diff-lib.sh
 
 echo >path0 'Line 1
 Line 2
@@ -16,15 +17,23 @@ chmod +x path1
 
 test_expect_success \
     'update-cache --add two files with and without +x.' \
-    'git-update-cache --add path0 path1'
+    'git update-index --add path0 path1'
 
 mv path0 path0-
 sed -e 's/line/Line/' <path0- >path0
 chmod +x path0
 rm -f path1
 test_expect_success \
-    'git-diff-files -p after editing work tree.' \
-    'git-diff-files -p >current'
+    'git diff-files -p after editing work tree.' \
+    'git diff-files -p >current'
+
+# that's as far as it comes
+if [ "$(git config --get core.filemode)" = false ]
+then
+	say 'filemode disabled on the filesystem'
+	test_done
+fi
+
 cat >expected <<\EOF
 diff --git a/path0 b/path0
 old mode 100644
@@ -47,16 +56,7 @@ deleted file mode 100755
 EOF
 
 test_expect_success \
-    'validate git-diff-files -p output.' \
-    'cmp -s current expected'
-
-test_expect_success \
-    'build same diff using git-diff-helper.' \
-    'git-diff-files -z | git-diff-helper -z >current'
-
-
-test_expect_success \
-    'validate git-diff-helper output.' \
-    'cmp -s current expected'
+    'validate git diff-files -p output.' \
+    'compare_diff_patch current expected'
 
 test_done