From: Ramsay Jones Date: Tue, 14 Dec 2010 18:19:09 GMT Subject: [PATCH 01/14] t3600-rm.sh: Don't pass a non-existent prereq to test #15 Message-ID: <4D07B51D.9000705@ramsay1.demon.co.uk> 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 --- t/t3600-rm.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index b26cabd..cd093bd 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 . -- 1.7.3