X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=67b9681d36e187a5717acbf9fe00a7f5dfd5bb65;hb=4edd44725c621b3a2c6c9c4d8f130ceea2ba355a;hp=f3b6330a9b4af0e68d9e402ab7d82e600c939ccc;hpb=5cfcd07c931e6029a77f9393309f7d0ec7cdc118;p=git.git diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index f3b6330a..67b9681d 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 @@ -25,6 +26,14 @@ 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 diff --git a/path0 b/path0 old mode 100644 @@ -48,6 +57,6 @@ EOF test_expect_success \ 'validate git-diff-files -p output.' \ - 'cmp -s current expected' + 'compare_diff_patch current expected' test_done