kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-02-20 14:02:47 -08:00
parent 2a86ec46da
commit fedd273b75
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-rerere.perl
View File

@ -131,7 +131,11 @@ sub record_preimage {
sub find_conflict { sub find_conflict {
my $in; my $in;
local $/ = "\0"; 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 = ();
my @path = (); my @path = ();
while (<$in>) { while (<$in>) {