From: Junio C Hamano Date: Mon, 20 Feb 2006 22:12:12 GMT Subject: [PATCH] rerere: avoid open "-|" list form for Perl 5.6 Message-ID: <7vpslhaddv.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vr75xbs8w.fsf_-_@assigned-by-dhcp.cox.net> Signed-off-by: Junio C Hamano --- git-rerere.perl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) 46fa107ab91b25eb928a9945ce4e9143b9c36df3 diff --git a/git-rerere.perl b/git-rerere.perl index df11951..d3664ff 100755 --- a/git-rerere.perl +++ b/git-rerere.perl @@ -131,7 +131,11 @@ sub record_preimage { sub find_conflict { my $in; local $/ = "\0"; - open $in, '-|', qw(git ls-files -z -u) or die "$!: ls-files"; + my $pid = open($in, '-|'); + die "$!" unless defined $pid; + if (!$pid) { + exec(qw(git ls-files -z -u)) or die "$!: ls-files"; + } my %path = (); my @path = (); while (<$in>) { -- 1.2.2.g5be4ea