X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rerere.perl;h=d3664ff491fe73d8a6acf6e2c4da5806c5753ce1;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hp=df119517fe6559a3e5d521f2cf54ea8fadebb36e;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/git-rerere.perl b/git-rerere.perl
index df119517..d3664ff4 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>) {