Merge branch 'pw/rebase-i-regression-fix-tests' into maint

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 3a2d709c2977ea3c9b735a3b56caf9d16274fdd3..7b36954d63d70e79149cf1558a93586e1b39c867 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -653,7 +653,7 @@ test_expect_success 'git clean -d respects pathspecs (pathspec is prefix of dir)
        test_path_is_dir foobar
 '
 
-test_expect_failure 'git clean -d skips untracked dirs containing ignored files' '
+test_expect_success 'git clean -d skips untracked dirs containing ignored files' '
        echo /foo/bar >.gitignore &&
        echo ignoreme >>.gitignore &&
        rm -rf foo &&