X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4006-diff-mode.sh;h=8c1b81e248bced2ccb5e4ff0067996462e89deb8;hb=cb16bcc36965f28845e4fae15c36280a2506f1be;hp=ab5406dd9f241edee7a6067a1426f0a65076eb10;hpb=f85fd3f0d1213a2b714fddc7a834817aceeca932;p=git.git diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index ab5406dd9..8c1b81e24 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -15,21 +15,10 @@ test_expect_success \ tree=`git write-tree` && echo $tree' -if [ "$(git config --get core.filemode)" = false ] -then - say 'filemode disabled on the filesystem, using update-index --chmod=+x' - test_expect_success \ - 'git update-index --chmod=+x' \ - 'git update-index rezrov && - git update-index --chmod=+x rezrov && - git diff-index $tree >current' -else - test_expect_success \ - 'chmod' \ - 'chmod +x rezrov && - git update-index rezrov && - git diff-index $tree >current' -fi +test_expect_success \ + 'chmod' \ + 'test_chmod +x rezrov && + git diff-index $tree >current' _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" @@ -38,6 +27,6 @@ echo ":100644 100755 X X M rezrov" >expected test_expect_success \ 'verify' \ - 'git diff expected check' + 'test_cmp expected check' test_done