rerere: avoid open "-|" list form for Perl 5.6
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Feb 20, 2006 at 14:02 UTC
fedd273b758e6aa844555e4e50ebfce59255e015
1 file changed
+5
-1
git-rerere.perl
+5
-1
@@ -131,7 +131,11 @@ sub record_preimage {
131
sub find_conflict {
132
my $in;
133
local $/ = "\0";
134
- open $in, '-|', qw(git ls-files -z -u) or die "$!: ls-files";
134
+ my $pid = open($in, '-|');
135
+ die "$!" unless defined $pid;
136
+ if (!$pid) {
137
+ exec(qw(git ls-files -z -u)) or die "$!: ls-files";
138
+ }
139
my %path = ();
140
my @path = ();
141
while (<$in>) {