diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-22 14:41:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-22 14:41:26 -0800 |
commit | 48e0ad033ffd009df1283858ac70ac53660e2d7c (patch) | |
tree | d8da9c9de20df434b1962b09ad59ff9ee04d7658 /t/t3600-rm.sh | |
parent | cfa775c10ef698c7b84e2d460d04272993c30da4 (diff) | |
parent | 1b3187ba6efdb216a9b45dac087aa4bfba0b90ae (diff) | |
download | git-48e0ad033ffd009df1283858ac70ac53660e2d7c.tar.gz |
Merge branch 'rj/maint-test-fixes'
* rj/maint-test-fixes:
t9501-*.sh: Fix a test failure on Cygwin
lib-git-svn.sh: Add check for mis-configured web server variables
lib-git-svn.sh: Avoid setting web server variables unnecessarily
t9142: Move call to start_httpd into the setup test
t3600-rm.sh: Don't pass a non-existent prereq to test #15
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-x | 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 b26cabd571..cd093bd347 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 . |