X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4102-apply-rename.sh;h=fbb508d389e078263d983bf6736df8f1a0fe7b5d;hb=143f4d94c6e2188a6bedfdfa268e66b579e3fbf9;hp=f591a5681dc4ac4abe44cc04a488414481c98ac5;hpb=ca08acca68bf0e1c89fcbc29af18b68ea7bf5c36;p=git.git diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index f591a568..fbb508d3 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -26,12 +26,17 @@ echo 'This is foo' >foo chmod +x foo test_expect_success setup \ - 'git-update-cache --add foo' + 'git-update-index --add foo' test_expect_success apply \ 'git-apply --index --stat --summary --apply test-patch' -test_expect_success validate \ - 'test -f bar && ls -l bar | grep "^-..x..x..x"' +if [ "$(git repo-config --get core.filemode)" = false ] +then + say 'filemode disabled on the filesystem' +else + test_expect_success validate \ + 'test -f bar && ls -l bar | grep "^-..x......"' +fi test_done