X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/146174a91a192983720a158796dc066226ad0e55..ee950a0c9a9d3ecf5257e0b7b480b83676106a22:/Porting/p4d2p diff --git a/Porting/p4d2p b/Porting/p4d2p index f645ef8..8003bf7 100755 --- a/Porting/p4d2p +++ b/Porting/p4d2p @@ -1,4 +1,4 @@ -#!/l/local/bin/perl -wspi.bak +#!/usr/bin/perl -wspi~ # # reads a perforce style diff on stdin and outputs appropriate headers @@ -36,7 +36,7 @@ USAGE } my ($cur, $match); -$cur = m<^==== //depot/(.+?)\#\d+.* ====$> ... m<^(\@\@.+\@\@|\*+)$>; +$cur = m<^==== //depot/(.+?)\#\d+.* ====( \w+)?$> ... m<^(\@\@.+\@\@|\*+)$>; $match = $1; @@ -71,7 +71,7 @@ if ($cur) { } } # see if we hit another patch (i.e. previous patch was empty) - elsif (m<^==== //depot/(.+?)\#\d+.* ====$>) { + elsif (m<^==== //depot/(.+?)\#\d+.* ====( \w+)?$>) { $file = $match = $1; } # suppress all other lines in the header