treewide: "require" + "use" cleanup and docs

[public-inbox.git] / lib / PublicInbox / SolverGit.pm

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index eab8459bc341935545b2e28b4e92ce0a22958b93..8629f0dafeb4216b41ac2c0951c866c8e76c2dcf 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -11,7 +11,7 @@ package PublicInbox::SolverGit;
 use strict;
 use warnings;
 use 5.010_001;
-use File::Temp 0.19 ();
+use File::Temp 0.19 (); # 0.19 for ->newdir
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Git qw(git_unquote git_quote);
 use PublicInbox::MsgIter qw(msg_iter msg_part_text);
@@ -155,7 +155,7 @@ sub extract_diff ($$) {
                # the meat of the diff, including "^\\No newline ..."
                # We also allow for totally blank lines w/o leading spaces,
                # because git-apply(1) handles that case, too
-               (?:^(?:[\@\+\x20\-\\][^\r\n]*|)$LF)+
+               (?:^(?:[\@\+\x20\-\\][^\n]*|)$LF)+
        )!smx or return;
 
        my $di = {