summaryrefslogtreecommitdiff
path: root/git-rerere.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-20 22:02:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-20 22:21:15 (GMT)
commitfedd273b758e6aa844555e4e50ebfce59255e015 (patch)
treeb04dddbd63b2f8c20978a02e641c40f2389c8ee1 /git-rerere.perl
parent2a86ec46da99e4cd5e6e394d378ba119d8f5069d (diff)
downloadgit-fedd273b758e6aa844555e4e50ebfce59255e015.zip
git-fedd273b758e6aa844555e4e50ebfce59255e015.tar.gz
git-fedd273b758e6aa844555e4e50ebfce59255e015.tar.bz2
rerere: avoid open "-|" list form for Perl 5.6
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rerere.perl')
-rwxr-xr-xgit-rerere.perl6
1 files changed, 5 insertions, 1 deletions
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>) {