diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:45 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:45 -0800 |
commit | a6f9decbe30318a0fdc4c7cad61e5e20b344d0d4 (patch) | |
tree | 1c83a87dcc334d2f83204a28d81c5cbb1a44b9ab /perl/Git/SVN/Ra.pm | |
parent | Merge branch 'tb/connect-ipv6-parse-fix' (diff) | |
parent | Git::SVN::*: avoid premature FileHandle closure (diff) | |
download | tgif-a6f9decbe30318a0fdc4c7cad61e5e20b344d0d4.tar.xz |
Merge branch 'ew/svn-maint-fixes'
Correct a breakage to git-svn around v2.2 era that triggers
premature closing of FileHandle.
* ew/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.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index 622535e217..32e2f19ea4 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -391,6 +391,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 { |