solver: allow literal '\r' character in diff lines

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index eab8459bc341935545b2e28b4e92ce0a22958b93..5ac27988591c961a9335735727d8b3cf80f825a4 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -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 = {