Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git:
user-manual: Add section on ignoring files
user-manual: finding commits referencing given file content
user-manual: discourage shared repository
tutorial: revise index introduction
tutorials: add user-manual links
diff --git a/git-svn.perl b/git-svn.perl
index f4c9ff1..eda9969 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -485,6 +485,11 @@
unless (defined $_trunk || defined $_branches || defined $_tags) {
usage(1);
}
+
+ # there are currently some bugs that prevent multi-init/multi-fetch
+ # setups from working well without this.
+ $Git::SVN::_minimize_url = 1;
+
$_prefix = '' unless defined $_prefix;
if (defined $url) {
$url =~ s#/+$##;
@@ -2841,8 +2846,10 @@
my ($self) = @_;
my ($p,$bat) = ($self->{pool}, $self->{bat});
foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) {
+ next if $_ eq '';
$self->close_directory($bat->{$_}, $p);
}
+ $self->close_directory($bat->{''}, $p);
$self->SUPER::close_edit($p);
$p->clear;
}