From 10c5443e550b5dfae9a194405aca62684e79e3d5 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 26 Oct 2011 23:02:06 +0200
Subject: bisect-runner.pl now copes when historical MANIFEST files list
 directories.

It had assumed that MANIFEST only listed files, which caused its
'force-manifest' code to choke on revisions between 27332437a2ed1941 and
bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
---
 Porting/bisect-runner.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Porting')

diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl
index 6fecdd8b8d..ff3e6ca1e3 100755
--- a/Porting/bisect-runner.pl
+++ b/Porting/bisect-runner.pl
@@ -1314,8 +1314,10 @@ if ($options{'force-manifest'}) {
         or die "Could not open MANIFEST: $!";
     while (<$fh>) {
         next unless /^(\S+)/;
+        # -d is special case needed (at least) between 27332437a2ed1941 and
+        # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
         push @missing, $1
-            unless -f $1;
+            unless -f $1 || -d $1;
     }
     close $fh or die "Can't close MANIFEST: $!";
 
-- 
cgit v1.2.1