# [PATCH] git svn: Don't create empty directories whose parents were deleted 2 messages from 2009-12-08 to 2009-12-08. Participants: Greg Price, Eric Wong. Thread: https://gitlist.dev/t/21897 ## Greg Price, 2009-12-08 03:28 Subject: [PATCH] git svn: Don't create empty directories whose parents were deleted Message-ID: <20091208032831.GL30538@dr-wily.mit.edu> URL: https://gitlist.dev/e/20091208032831.GL30538%40dr-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 Signed-off-by: Greg Price --- 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 ``` ## Eric Wong, 2009-12-08 04:59 Subject: Re: [PATCH] git svn: Don't create empty directories whose parents were deleted Message-ID: <20091208045926.GA17683@dcvr.yhbt.net> URL: https://gitlist.dev/e/20091208045926.GA17683%40dcvr.yhbt.net In-Reply-To: <20091208032831.GL30538@dr-wily.mit.edu> ``` Greg Price wrote: > This is a regression in v1.6.6-rc0, so it would be good to fix before v1.6.6. Thanks Greg, I found another git svn bug (fixed in a patch below) while writing a test case for this. Junio: The following are pushed out to git://git.bogomips.org/git-svn and should be ready for v1.6.6: Alex Vandiver (1): git-svn: sort svk merge tickets to account for minimal parents Eric Wong (1): git svn: log removals of empty directories Greg Price (1): git svn: Don't create empty directories whose parents were deleted Thanks all >From f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 7 Dec 2009 20:49:38 -0800 Subject: [PATCH] git svn: log removals of empty directories This also adds a test case for: "git svn: Don't create empty directories whose parents were deleted" which was the reason we found this bug in the first place. Signed-off-by: Eric Wong --- git-svn.perl | 2 +- t/t9146-git-svn-empty-dirs.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index bdd1f96..5a52068 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3891,11 +3891,11 @@ sub delete_entry { } print "\tD\t$gpath/\n" unless $::_q; command_close_pipe($ls, $ctx); - $self->{empty}->{$path} = 0 } else { $self->{gii}->remove($gpath); print "\tD\t$gpath\n" unless $::_q; } + $self->{empty}->{$path} = 0; undef; } diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh index 70c52c1..9b8d046 100755 --- a/t/t9146-git-svn-empty-dirs.sh +++ b/t/t9146-git-svn-empty-dirs.sh @@ -105,4 +105,14 @@ test_expect_success 'empty directories in trunk exist' ' ) ' +test_expect_success 'remove a top-level directory from svn' ' + svn_cmd rm -m "remove d" "$svnrepo"/d +' + +test_expect_success 'removed top-level directory does not exist' ' + git svn clone "$svnrepo" removed && + test ! -e removed/d + +' + test_done -- Eric Wong ```