* [PATCH 4/3] solver: allow literal '\r' character in diff lines
@ 2020-01-04 4:19 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2020-01-04 4:19 UTC (permalink / raw)
To: meta
While filenames are escaped, the actual diff contents may
contain an unescaped "\r" carriage return byte not in front
of the "\n" line feed. So just allow "\r" to appear in the
middle of a line.
---
lib/PublicInbox/SolverGit.pm | 2 +-
xt/solver.t | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index eab8459b..5ac27988 100644
--- 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 = {
diff --git a/xt/solver.t b/xt/solver.t
index e9f24e7f..4ff57fe7 100644
--- a/xt/solver.t
+++ b/xt/solver.t
@@ -20,6 +20,8 @@ my $app = sub {
# TODO: convert these to self-contained test cases
my $todo = {
'git' => [
+ '9e9048b02bd04d287461543d85db0bb715b89f8c'
+ .'/s/?b=t%2Ft3420%2Fremove-ids.sed',
'eebf7a8/s/?b=t%2Ftest-lib.sh',
'eb580ca513/s/?b=remote-odb.c',
'776fa90f7f/s/?b=contrib/git-jump/git-jump',
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-04 3:34 [PATCH 0/3] more solver fixes Eric Wong
2020-01-04 4:19 7% ` [PATCH 4/3] solver: allow literal '\r' character in diff lines Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).