From: Ramsay Jones Date: Tue, 14 Dec 2010 18:19:09 +0000 (+0000) Subject: t3600-rm.sh: Don't pass a non-existent prereq to test #15 X-Git-Tag: v1.7.4-rc0~8^2~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbbfc8a9bb91ddd325995cc346eab91c06c9cd64;p=git.git t3600-rm.sh: Don't pass a non-existent prereq to test #15 Commit c91cfd19 (tests: A SANITY test prereq for testing if we're root, 2010-08-06) introduced a SANITY prerequisite which had very similar semantics to RO_DIR. That commit removed the code to set RO_DIR, but forgot to replace RO_DIR with SANITY in test #15. In order not to skip test 15 unnecessarily, since RO_DIR will never be set, we pass the SANITY prerequisite instead. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index b26cabd57..cd093bd34 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -96,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 .