X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3600-rm.sh;h=cd093bd34730a3dba6eec7719d3b0170e517fb5e;hb=61cf28204508c095a68e7a9cb6307ca2a27112c9;hp=0aaf0ad84b05e1ee17e9789811ea06f2d2798556;hpb=49559cad6cab8af548321249d320d9bb372d1859;p=git.git

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 0aaf0ad84..cd093bd34 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'
@@ -112,7 +96,7 @@ test_expect_success FUNNYNAMES \
     "git rm -f 'space embedded' 'tab	embedded' 'newline
 embedded'"
 
-test_expect_success RO_DIR 'Test that "git rm -f" fails if its rm fails' '
+test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
 	chmod a-w . &&
 	test_must_fail git rm -f baz &&
 	chmod 775 .