Merge branch 'ja/maint-pull-rebase-doc' into maint

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 3a43571cab78bce546ca714c8d53b76fc94c6ee2..6c776e9bec78ab1cf960293d8c796e9de13045b5 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -388,16 +388,15 @@ test_expect_success 'core.excludesfile' '
 
 '
 
-test_expect_success 'removal failure' '
+test_expect_success SANITY 'removal failure' '
 
        mkdir foo &&
        touch foo/bar &&
        (exec <foo/bar &&
         chmod 0 foo &&
-        test_must_fail git clean -f -d)
-
+        test_must_fail git clean -f -d &&
+        chmod 755 foo)
 '
-chmod 755 foo
 
 test_expect_success 'nested git work tree' '
        rm -fr foo bar &&
@@ -444,7 +443,7 @@ test_expect_success 'git clean -e' '
        (
                cd repo &&
                git init &&
-               touch 1 2 3 known &&
+               touch known 1 2 3 &&
                git add known &&
                git clean -f -e 1 -e 2 &&
                test -e 1 &&