X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4102-apply-rename.sh;h=1597965241c3566aa3a14e986fd5a630fb348479;hb=f90cf2b9203e81e3a2b70b15480628e9189b7e60;hp=d42abff1ad59343fa1c84bded9a82c3212370da0;hpb=f4198c9b7d319a7a595f0d759e7d8094387ab77b;p=git.git diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index d42abff1a..159796524 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -31,14 +31,16 @@ test_expect_success setup \ test_expect_success apply \ 'git apply --index --stat --summary --apply test-patch' -if [ "$(git config --get core.filemode)" = false ] +if test "$(git config --bool core.filemode)" = false then say 'filemode disabled on the filesystem' else - test_expect_success validate \ - 'test -f bar && ls -l bar | grep "^-..x......"' + test_set_prereq FILEMODE fi +test_expect_success FILEMODE validate \ + 'test -f bar && ls -l bar | grep "^-..x......"' + test_expect_success 'apply reverse' \ 'git apply -R --index --stat --summary --apply test-patch && test "$(cat foo)" = "This is foo"'