Merge in 1.6.5.4

diff --git a/git-svn.perl b/git-svn.perl
index 7f7a56fbea68f3964f91fd9a324bfe821c9c1bc0..957d44e63004cef131fca5c7dad75e7049d15842 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2752,8 +2752,11 @@ sub mkemptydirs {
                }
        }
        close $fh;
+
+       my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
        foreach my $d (sort keys %empty_dirs) {
                $d = uri_decode($d);
+               $d =~ s/$strip//;
                next if -d $d;
                if (-e _) {
                        warn "$d exists but is not a directory\n";