mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
rerere: avoid open "-|" list form for Perl 5.6
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
2a86ec46da
commit
fedd273b75
1 changed files with 5 additions and 1 deletions
|
@ -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>) {
|
||||
|
|
Loading…
Reference in a new issue