From 05cd3ce55b8c9c250e3725c99385d13059cac81d Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 28 Oct 2011 13:02:10 +0200
Subject: [PATCH] In bisect-runner.pl, make the code to report patching errors
 more robust.

Previously it was relying on matching an optional part of the patch to get
the name of the file. Now it matches a mandatory part of the patch to get it.
---
 Porting/bisect-runner.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl
index 92e6e2d..44a321b 100755
--- a/Porting/bisect-runner.pl
+++ b/Porting/bisect-runner.pl
@@ -449,7 +449,7 @@ sub edit_file {
 sub apply_patch {
     my $patch = shift;
 
-    my ($file) = $patch =~ qr!^diff.*a/(\S+) b/\1!;
+    my ($file) = $patch =~ qr!^--- a/(\S+)\n\+\+\+ b/\1!sm;
     open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
     print $fh $patch;
     return if close $fh;
-- 
2.7.4