From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>,
Matthias Urlichs <smurf@smurf.noris.de>
Subject: [PATCH] svmimport: avoid open "-|" list form for Perl 5.6
Date: Mon, 20 Feb 2006 14:12:32 -0800 [thread overview]
Message-ID: <7vek1xaddb.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 7vr75xbs8w.fsf_-_@assigned-by-dhcp.cox.net
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
git-svnimport.perl | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
f7e8f8415c5c88082daecac44cfbba561113a3d9
diff --git a/git-svnimport.perl b/git-svnimport.perl
index c536d70..ee2940f 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -10,7 +10,6 @@
# The head revision is on branch "origin" by default.
# You can change that with the '-o' option.
-require 5.008; # for shell-safe open("-|",LIST)
use strict;
use warnings;
use Getopt::Std;
@@ -322,8 +321,12 @@ sub get_file($$$) {
return undef unless defined $name;
}
- open my $F, '-|', "git-hash-object", "-w", $name
+ my $pid = open(my $F, '-|');
+ die $! unless defined $pid;
+ if (!$pid) {
+ exec("git-hash-object", "-w", $name)
or die "Cannot create object: $!\n";
+ }
my $sha = <$F>;
chomp $sha;
close $F;
@@ -398,7 +401,12 @@ sub copy_path($$$$$$$$) {
$srcpath =~ s#/*$#/#;
}
- open my $f,"-|","git-ls-tree","-r","-z",$gitrev,$srcpath;
+ my $pid = open my $f,'-|';
+ die $! unless defined $pid;
+ if (!$pid) {
+ exec("git-ls-tree","-r","-z",$gitrev,$srcpath)
+ or die $!;
+ }
local $/ = "\0";
while(<$f>) {
chomp;
@@ -554,7 +562,11 @@ sub commit {
@o1 = @old;
@old = ();
}
- open my $F, "-|", "git-ls-files", "-z", @o1 or die $!;
+ my $pid = open my $F, "-|";
+ die "$!" unless defined $pid;
+ if (!$pid) {
+ exec("git-ls-files", "-z", @o1) or die $!;
+ }
@o1 = ();
local $/ = "\0";
while(<$F>) {
--
1.2.2.g5be4ea
next prev parent reply other threads:[~2006-02-20 22:12 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-20 18:37 Should we support Perl 5.6? Johannes Schindelin
2006-02-20 19:10 ` Eric Wong
2006-02-20 21:01 ` Andreas Ericsson
2006-02-20 21:15 ` Junio C Hamano
2006-02-20 22:05 ` [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6 Junio C Hamano
2006-02-20 22:12 ` [PATCH] rerere: " Junio C Hamano
2006-02-20 22:12 ` [PATCH] send-email: " Junio C Hamano
2006-02-20 22:12 ` Junio C Hamano [this message]
2006-02-20 22:19 ` [PATCH] cvsimport: " Junio C Hamano
2006-02-21 17:30 ` [PATCH] fmt-merge-msg: " Alex Riesen
2006-02-21 20:36 ` Sam Vilain
2006-02-21 21:57 ` Alex Riesen
2006-02-21 22:19 ` Johannes Schindelin
2006-02-21 22:35 ` Eric Wong
2006-02-21 22:38 ` Shawn Pearce
2006-02-21 23:00 ` Martin Langhoff
2006-02-21 22:38 ` Sam Vilain
2006-02-22 16:35 ` Alex Riesen
2006-02-22 19:44 ` Johannes Schindelin
2006-02-22 19:51 ` Sam Vilain
2006-02-22 19:54 ` Junio C Hamano
2006-02-22 22:00 ` Johannes Schindelin
2006-02-22 22:25 ` Junio C Hamano
2006-02-23 8:00 ` Alex Riesen
2006-02-23 8:45 ` Junio C Hamano
2006-02-23 9:35 ` Alex Riesen
2006-02-23 9:41 ` Alex Riesen
2006-02-23 9:48 ` Andreas Ericsson
2006-02-23 10:10 ` Alex Riesen
2006-02-23 13:29 ` Andreas Ericsson
2006-02-23 14:07 ` Alex Riesen
2006-02-23 14:22 ` Andreas Ericsson
2006-02-23 17:13 ` Linus Torvalds
2006-02-23 19:32 ` Junio C Hamano
2006-02-23 19:38 ` Johannes Schindelin
2006-02-23 19:54 ` Linus Torvalds
2006-02-23 20:19 ` Johannes Schindelin
2006-02-23 19:51 ` Linus Torvalds
2006-02-23 20:31 ` Sam Vilain
2006-02-24 6:43 ` Linus Torvalds
2006-02-23 21:43 ` Alex Riesen
2006-02-26 19:55 ` Christopher Faylor
2006-02-26 20:18 ` Linus Torvalds
2006-02-26 20:40 ` Christopher Faylor
2006-03-02 14:18 ` Alex Riesen
2006-03-02 15:18 ` Mark Wooding
2006-03-02 16:11 ` Alex Riesen
2006-03-02 15:22 ` Christopher Faylor
2006-03-02 16:20 ` Alex Riesen
2006-02-26 23:17 ` NT directory traversal speed on 25K files on Cygwin Rutger Nijlunsing
2006-02-27 1:18 ` Christopher Faylor
2006-02-27 18:30 ` Rutger Nijlunsing
2006-02-27 18:34 ` Christopher Faylor
2006-02-27 9:19 ` Andreas Ericsson
2006-02-27 18:45 ` Rutger Nijlunsing
2006-03-02 13:40 ` Alex Riesen
2006-03-02 14:10 ` [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6 Alex Riesen
2006-03-02 15:00 ` Christopher Faylor
2006-03-02 16:10 ` Alex Riesen
2006-03-02 17:39 ` Andreas Ericsson
2006-03-02 22:01 ` Alex Riesen
2006-02-26 20:33 ` Christopher Faylor
2006-02-24 12:02 ` Eric Wong
2006-02-24 13:44 ` Johannes Schindelin
2006-02-24 16:14 ` Linus Torvalds
2006-02-21 20:56 ` Eric Wong
2006-02-21 22:04 ` Alex Riesen
[not found] ` <1cf1c57a0602211412r1988b14ao435edd29207dc0d0@mail.gmail.com>
2006-02-21 22:13 ` Ron Parker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vek1xaddb.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).