projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a86ec4
)
rerere: avoid open "-|" list form for Perl 5.6
author
Junio C Hamano
<junkio@cox.net>
Mon, 20 Feb 2006 22:02:47 +0000
(14:02 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 20 Feb 2006 22:21:15 +0000
(14:21 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rerere.perl
patch
|
blob
|
history
diff --git
a/git-rerere.perl
b/git-rerere.perl
index df119517fe6559a3e5d521f2cf54ea8fadebb36e..d3664ff491fe73d8a6acf6e2c4da5806c5753ce1 100755
(executable)
--- 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>) {