[PATCH] git svn: Don't create empty directories whose parents were deleted
- From
Greg Price <price@ksplice.com>
- Date
- Dec 8, 2009, 03:28 UTC
- Message-ID
- <20091208032831.GL30538@dr-wily.mit.edu>
Commit 6111b93 "git svn: attempt to create empty dirs on clone+rebase" will create empty directories 'a/b' and 'a/c' if they were previously created in SVN, even if their parent directory 'a' was deleted.
For example, unhandled.log may contain lines like this:
r32 +empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/acl +empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/machine.d +empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/moira-acl [...] r314 -empty_dir: packages/sipb-xen-remctl-auto
Reported-by: Evan Broder <broder@mit.edu> Signed-off-by: Greg Price <price@ksplice.com> ---
This is a regression in v1.6.6-rc0, so it would be good to fix before v1.6.6.
git-svn.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index 957d44e..5c35494 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2748,7 +2748,7 @@ sub mkemptydirs { } elsif (/^ \+empty_dir: (.+)$/) { $empty_dirs{$1} = 1; } elsif (/^ \-empty_dir: (.+)$/) { - delete $empty_dirs{$1}; + delete @empty_dirs{grep {m[^\Q$1\E(/|$)]} (keys %empty_dirs)}; } } close $fh;
-- 1.6.4.4