X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=c44b27aeb24816a346f0aa84d70546a0ffd83b2a;hb=7d3580d74c6d801419dd91416f9a81750b7d4e2c;hp=beb6d8f4877c157bdf9e3efa2c914e74da863cd5;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index beb6d8f48..c44b27aeb 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -16,16 +16,24 @@ cat path0 >path1 chmod +x path1 test_expect_success \ - 'update-cache --add two files with and without +x.' \ - 'git-update-index --add path0 path1' + 'update-index --add two files with and without +x.' \ + 'git update-index --add path0 path1' mv path0 path0- sed -e 's/line/Line/' 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 @@ -48,7 +56,7 @@ deleted file mode 100755 EOF test_expect_success \ - 'validate git-diff-files -p output.' \ + 'validate git diff-files -p output.' \ 'compare_diff_patch current expected' test_done