Merge branch 'sd/t3200-branch-m-test'

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5f9913ba33d3edc848b03fc37bed587fe5c54849..f8568f8841d34d17f3d8fdae4d8d2404a6693c4d 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -97,9 +97,9 @@ test_expect_success FUNNYNAMES \
 embedded'"
 
 test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
+       test_when_finished "chmod 775 ." &&
        chmod a-w . &&
-       test_must_fail git rm -f baz &&
-       chmod 775 .
+       test_must_fail git rm -f baz
 '
 
 test_expect_success \