X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft3600-rm.sh;h=b26cabd571503696a2bfa356e4f6ac46febf74ba;hb=0137ef7dae553f9eb89cbae1ddb60b72046ba28b;hp=0aaf0ad84b05e1ee17e9789811ea06f2d2798556;hpb=ad336054068074ed614d0bb54bb169e5263499d7;p=git.git diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 0aaf0ad84..b26cabd57 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -28,22 +28,6 @@ embedded' && git commit -m 'add files with tabs and newlines' " -# Determine rm behavior -# Later we will try removing an unremovable path to make sure -# git rm barfs, but if the test is run as root that cannot be -# arranged. -: >test-file -chmod a-w . -rm -f test-file 2>/dev/null -if test -f test-file -then - test_set_prereq RO_DIR -else - say 'skipping removal failure test (perhaps running as root?)' -fi -chmod 775 . -rm -f test-file - test_expect_success \ 'Pre-check that foo exists and is in index before git rm foo' \ '[ -f foo ] && git ls-files --error-unmatch foo'