diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-10 20:56:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 20:56:20 (GMT) |
| commit | b281eea75f0ab68e3c9510323c73b78cd3e62814 (patch) | |
| tree | d2038eadf370012addf920249883e15e6bfba69a /git-svn.perl | |
| parent | da06a80322a2357b8b5b6ddb8b5648f97ed73e83 (diff) | |
| parent | 873358dd2ac3bf2cea9a370d8586378a27a092f2 (diff) | |
| download | git-b281eea75f0ab68e3c9510323c73b78cd3e62814.zip git-b281eea75f0ab68e3c9510323c73b78cd3e62814.tar.gz git-b281eea75f0ab68e3c9510323c73b78cd3e62814.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.0.2
Use compatibility regex library for OSX/Darwin
git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
Git.pm: Use File::Temp->tempfile instead of ->new
t7501: always use test_cmp instead of diff
Conflicts:
Makefile
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-svn.perl b/git-svn.perl index ecacf74..88066c9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3304,7 +3304,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 $!; @@ -3315,7 +3315,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); @@ -4425,7 +4425,7 @@ sub config_pager { sub run_pager { return unless -t *STDOUT && defined $pager; - pipe my $rfd, my $wfd or return; + pipe my ($rfd, $wfd) or return; defined(my $pid = fork) or ::fatal "Can't fork: $!"; if (!$pid) { open STDOUT, '>&', $wfd or |