X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=67b9681d36e187a5717acbf9fe00a7f5dfd5bb65;hb=95a31cc5b32c5ab787e419124826ac202a00b7f5;hp=d8694121d6f56d6c087727e5d5f3615d9420c5b4;hpb=13ab4462d2aefb252d7c916bd537151856b7c967;p=git.git

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
old mode 100644
new mode 100755
index d8694121..67b9681d
--- 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,7 +17,7 @@ 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
@@ -25,8 +26,18 @@ rm -f path1
 test_expect_success \
     'git-diff-files -p after editing work tree.' \
     'git-diff-files -p >current'
+
+# that's as far as it comes
+if [ "$(git repo-config --get core.filemode)" = false ]
+then
+	say 'filemode disabled on the filesystem'
+	test_done
+fi
+
 cat >expected <<\EOF
-# mode: 100644 100755 path0
+diff --git a/path0 b/path0
+old mode 100644
+new mode 100755
 --- a/path0
 +++ b/path0
 @@ -1,3 +1,3 @@
@@ -34,7 +45,8 @@ cat >expected <<\EOF
  Line 2
 -line 3
 +Line 3
-# mode: 100755 . path1
+diff --git a/path1 b/path1
+deleted file mode 100755
 --- a/path1
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -45,6 +57,6 @@ EOF
 
 test_expect_success \
     'validate git-diff-files -p output.' \
-    'cmp -s current expected'
+    'compare_diff_patch current expected'
 
 test_done