summaryrefslogtreecommitdiff
path: root/perl/Git/SVN/Ra.pm
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-26 14:03:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-26 14:03:57 -0800
commit28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04 (patch)
tree89b62e09fe810cacfa218c4ca3b3bee2d4a90cb2 /perl/Git/SVN/Ra.pm
parentgit-svn: lazy load some modules (diff)
parentGit::SVN::*: avoid premature FileHandle closure (diff)
downloadtgif-28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04.tar.xz
Merge branch 'svn-maint-fixes' into svn-fixes
* svn-maint-fixes: Git::SVN::*: avoid premature FileHandle closure git-svn: fix localtime=true on non-glibc environments
Diffstat (limited to 'perl/Git/SVN/Ra.pm')
-rw-r--r--perl/Git/SVN/Ra.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index cf36b9d3cd..4a499fcb38 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -394,6 +394,9 @@ sub longest_common_path {
sub gs_fetch_loop_common {
my ($self, $base, $head, $gsv, $globs) = @_;
return if ($base > $head);
+ # Make sure the cat_blob open2 FileHandle is created before calling
+ # SVN::Pool::new_default so that it does not incorrectly end up in the pool.
+ $::_repository->_open_cat_blob_if_needed;
my $gpool = SVN::Pool->new_default;
my $ra_url = $self->url;
my $reload_ra = sub {