Merge branch 'np/delta' into next

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 60ed7ae3ee450878d8ef6dc3bf1f60670d1078d3..61f559f0a8ae69c04cfe9d8700591cedda41989c 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -136,8 +136,10 @@ sub file {
 
        print "... $rev $path ...\n" if $opt_v;
        my (undef, $properties);
+       my $pool = SVN::Pool->new();
        eval { (undef, $properties)
-                  = $self->{'svn'}->get_file($path,$rev,$fh); };
+                  = $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
+       $pool->clear;
        if($@) {
                return undef if $@ =~ /Attempted to get checksum/;
                die $@;