X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4006-diff-mode.sh;h=ca342f48a198c2e98e4459273e8350bb7aed6328;hb=9e64d109f905afb225f48409c4e0e068b2203332;hp=e2a67e9633811453c1b5c63d9936728e62e4585e;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index e2a67e963..ca342f48a 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -15,11 +15,21 @@ test_expect_success \ tree=`git-write-tree` && echo $tree' -test_expect_success \ - 'chmod' \ - 'chmod +x rezrov && - git-update-index rezrov && - git-diff-index $tree >current' +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 _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"