[PATCH] rerere: avoid open "-|" list form for Perl 5.6
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Junio C Hamano <redacted> --- 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