git-svn: add an option to skip the creation of empty directories

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 691c5fda30e8d40b122200a55debd3e0e3241f3b..c86e298d082316ff5a4de6f07c0faba85c65d4e1 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -150,6 +150,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
        git rm -fr . &&
        git checkout --orphan new &&
        cp important c0.c &&
+       test_when_finished "rm c0.c" &&
        test_must_fail git merge c0 2>out &&
        test_cmp out expect &&
        test_path_is_missing .git/MERGE_HEAD &&
@@ -164,7 +165,7 @@ test_expect_success 'set up unborn branch and content' '
        echo bar > untracked-file
 '
 
-test_expect_failure 'will not clobber WT/index when merging into unborn' '
+test_expect_success 'will not clobber WT/index when merging into unborn' '
        git merge master &&
        grep foo tracked-file &&
        git show :tracked-file >expect &&