From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 22:02:47 +0000 (-0800)
Subject: rerere: avoid open "-|" list form for Perl 5.6
X-Git-Tag: v1.3.0-rc1~163^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fedd273b758e6aa844555e4e50ebfce59255e015;p=git.git

rerere: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-rerere.perl b/git-rerere.perl
index df119517f..d3664ff49 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>) {