summaryrefslogtreecommitdiff
path: root/Porting/bisect-runner.pl
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2013-02-26 20:50:46 +0100
committerNicholas Clark <nick@ccl4.org>2013-05-28 09:19:30 +0200
commitbff4c28782fd076ae48bd99ed064d30b6e14e291 (patch)
tree22d86bcdff2de754a9f5eb18bc548966b444c01b /Porting/bisect-runner.pl
parent3f468b94fc9d0dacf058976dfcac9370a9d23c13 (diff)
downloadperl-bff4c28782fd076ae48bd99ed064d30b6e14e291.tar.gz
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/
Diffstat (limited to 'Porting/bisect-runner.pl')
-rwxr-xr-xPorting/bisect-runner.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl
index be88d59c56..101b036615 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);