diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-21 00:45:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-21 00:45:40 -0700 |
| commit | 3c144afe50b58875a41ea56ef118f41be7bf605a (patch) | |
| tree | 7d68b348862205a33f72d57fb7719f6dfa16920e /git-svnimport.perl | |
| parent | 0080f50eb333192617739c9954a30611cc0adeaa (diff) | |
| parent | 0dec30b9788b12fdae5d5b69fc366a28bb688d80 (diff) | |
| download | git-3c144afe50b58875a41ea56ef118f41be7bf605a.tar.gz | |
Merge branch 'fix'
* fix:
fix pack-object buffer size
mailinfo: decode underscore used in "Q" encoding properly.
Reintroduce svn pools to solve the memory leak.
pack-objects: do not stop at object that is "too small"
Diffstat (limited to 'git-svnimport.perl')
| -rwxr-xr-x | git-svnimport.perl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl index 60ed7ae3ee..61f559f0a8 100755 --- 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 $@; |