diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:23:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:23:33 -0700 |
| commit | 0f7483ee97d77831082e625dffbae1cd50bf5a02 (patch) | |
| tree | 1c9b9648c85289fa9c2935552206641bc038cb3f /perl/Git | |
| parent | Merge branch 'jc/check-x-z' (diff) | |
| parent | Git.pm: revert _temp_cache use of temp_is_locked (diff) | |
| download | tgif-0f7483ee97d77831082e625dffbae1cd50bf5a02.tar.xz | |
Merge branch 'km/svn-1.8-serf-only'
Subversion 1.8.0 that was recently released breaks older subversion
clients coming over http/https in various ways.
* km/svn-1.8-serf-only:
Git.pm: revert _temp_cache use of temp_is_locked
git-svn: allow git-svn fetching to work using serf
Git.pm: add new temp_is_locked function
Diffstat (limited to 'perl/Git')
| -rw-r--r-- | perl/Git/SVN/Fetcher.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm index bd174189b9..10edb27732 100644 --- a/perl/Git/SVN/Fetcher.pm +++ b/perl/Git/SVN/Fetcher.pm @@ -315,11 +315,13 @@ sub change_file_prop { sub apply_textdelta { my ($self, $fb, $exp) = @_; return undef if $self->is_path_ignored($fb->{path}); - my $fh = $::_repository->temp_acquire('svn_delta'); + my $suffix = 0; + ++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix"); + my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix"); # $fh gets auto-closed() by SVN::TxDelta::apply(), # (but $base does not,) so dup() it for reading in close_file open my $dup, '<&', $fh or croak $!; - my $base = $::_repository->temp_acquire('git_blob'); + my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix"); if ($fb->{blob}) { my ($base_is_link, $size); |