diff options
| author | Marcus Griep <marcus@griep.us> | 2008-09-08 12:53:01 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 11:45:22 -0700 |
| commit | 836ff95df6de9924cf8cf23515e3779a67a6bdec (patch) | |
| tree | c80c2a77c4b23c2bda00257928b2949ee79277a2 /git-svn.perl | |
| parent | 1e368681bd8c35202b91f8998e07d8bbb3de6c7c (diff) | |
| download | git-836ff95df6de9924cf8cf23515e3779a67a6bdec.tar.gz git-836ff95df6de9924cf8cf23515e3779a67a6bdec.tar.xz | |
Git.pm: Use File::Temp->tempfile instead of ->new
Perl 5.8.0 ships with File::Temp 0.13, which does not have the new()
interface introduced in 0.14, as pointed out by Tom G. Christensen.
This modifies Git.pm to use the more established tempfile() interface
and updates 'git svn' to match.
Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 7a1d26db8..95c6c85bb 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3284,7 +3284,7 @@ sub close_file { my $out = syswrite($tmp_fh, $str, $res); defined($out) && $out == $res or croak("write ", - $tmp_fh->filename, + Git::temp_path($tmp_fh), ": $!\n"); } defined $res or croak $!; @@ -3295,7 +3295,7 @@ sub close_file { } $hash = $::_repository->hash_and_insert_object( - $fh->filename); + Git::temp_path($fh)); $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; Git::temp_release($fb->{base}, 1); |