From bff4c28782fd076ae48bd99ed064d30b6e14e291 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Tue, 26 Feb 2013 20:50:46 +0100 Subject: [PATCH] bisect-runner.pl should match patches with directory 'b' before 'a'. The pattern to extract the file for diagnostics should a patch not apply was failing to match (and generating a legitimate used of uninitialized value warning) for the case where the patch was specified as --- b/ +++ a/ The pattern was only expecting --- a/ +++ b/ --- 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 be88d59..101b036 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -967,7 +967,7 @@ sub apply_patch { my ($patch, $what, $files) = @_; $what = 'patch' unless defined $what; unless (defined $files) { - $patch =~ m!^--- a/(\S+)\n\+\+\+ b/\1!sm; + $patch =~ m!^--- [ab]/(\S+)\n\+\+\+ [ba]/\1!sm; $files = " $1"; } my $patch_to_use = placate_patch_prog($patch); -- 2.7.4