X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=7d92ae3e996b31f8fa9e0b62f40a04ec1940cf70;hb=7e0f1704b837355d833d84d18a3811d145867b97;hp=beb6d8f4877c157bdf9e3efa2c914e74da863cd5;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index beb6d8f48..7d92ae3e9 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -17,15 +17,23 @@ chmod +x path1 test_expect_success \ 'update-cache --add two files with and without +x.' \ - 'git-update-index --add path0 path1' + '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