From 0195eb10a0cb74ebe098b4596e8e78d0544df6fb Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 26 Apr 2019 07:42:24 +0000 Subject: viewdiff: do not break out of DSTATE_CTX on /^$/ It seems a common case for mangled patches is editors or MUAs dropping trailing whitespace, and lines matching /^ $/ gets the space dropped to only match /^$/. --- lib/PublicInbox/ViewDiff.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index 0cce952d..6b8d9437 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -146,7 +146,7 @@ sub flush_diff ($$$) { if ($s =~ /^---$/) { to_state($dst, $state, DSTATE_STAT); $$dst .= $s; - } elsif ($s =~ /^ /) { + } elsif ($s =~ /^ / || ($s =~ /^$/ && $state >= DSTATE_CTX)) { # works for common cases, but not weird/long filenames if ($state == DSTATE_STAT && $s =~ /^ (.+)( +\| .*\z)/s) { -- cgit v1.2.3-24-ge0c7