path: root/git-svn.perl
diff options
authorEric Wong <>2007-12-14 16:39:09 (GMT)
committerJunio C Hamano <>2007-12-14 20:06:23 (GMT)
commit12a6d752fb61b10194b2897defb2b34e09099b12 (patch)
tree2df66995e79377200754fe911ed6132be90ef8e3 /git-svn.perl
parent38a5b1d6ed2ba632504be7748e63f1441c93976d (diff)
git-svn: handle our top-level path being deleted and later re-added
Previously, git-svn would ignore cases where the path we're tracking is removed from the repository. This was to prevent heads with follow-parent from ending up with a tree full of empty revisions (and thus breaking rename detection). The previous behavior is fine until the path we're tracking is re-added later on, leading to the old files being merged in with the new files in the directory (because the old files were never marked as deleted) We will now only remove all the old files locally that were deleted remotely iff we detect the directory we're in is being created from scratch. Thanks for Marcus D. Hanwell for the bug report and Peter Baumann for the analysis. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-svn.perl')
1 files changed, 14 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 3aa7f8c..d411a34 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3045,6 +3045,20 @@ sub add_file {
sub add_directory {
my ($self, $path, $cp_path, $cp_rev) = @_;
+ my $gpath = $self->git_path($path);
+ if ($gpath eq '') {
+ my ($ls, $ctx) = command_output_pipe(qw/ls-tree
+ -r --name-only -z/,
+ $self->{c});
+ local $/ = "\0";
+ while (<$ls>) {
+ chomp;
+ $self->{gii}->remove($_);
+ print "\tD\t$_\n" unless $::_q;
+ }
+ command_close_pipe($ls, $ctx);
+ $self->{empty}->{$path} = 0;
+ }
my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
delete $self->{empty}->{$dir};
$self->{empty}->{$path} = 1;