user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/6] searchidx: index_diff: allow /^$/ line as diff context
Date: Fri,  3 Jan 2020 08:45:58 +0000	[thread overview]
Message-ID: <20200103084603.8405-2-e@80x24.org> (raw)
In-Reply-To: <20200103084603.8405-1-e@80x24.org>

As discovered by solver bug hunting, "git apply" also handles
the case where blank lines w/o leading space are treated as diff
context, apparently because GNU diff once did it:

https://public-inbox.org/git/b507b465f7831612b9d9fc643e3e5218b64e5bfa/s/
---
 lib/PublicInbox/SearchIdx.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 21ab8119..4cfbc4aa 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -255,7 +255,9 @@ sub index_diff ($$$) {
 				/^Binary files .* differ/) {
 			push @xnq, $_;
 		} elsif ($_ eq '') {
-			$in_diff = undef;
+			# possible to be in diff context, some mail may be
+			# stripped by MUA or even GNU diff(1).  "git apply"
+			# treats a bare "\n" as diff context, too
 		} else {
 			push @xnq, $_;
 			warn "non-diff line: $_\n" if DEBUG && $_ ne '';

  reply	other threads:[~2020-01-03  8:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-03  8:45 [PATCH 0/6] searchidx: minor fix and some cleanups Eric Wong
2020-01-03  8:45 ` Eric Wong [this message]
2020-01-03  8:45 ` [PATCH 2/6] searchidx: split off index_xapian for msg_iter Eric Wong
2020-01-03  8:46 ` [PATCH 3/6] searchidx: add_message: fix and make use of prototypes Eric Wong
2020-01-03  8:46 ` [PATCH 4/6] searchidx: simplify quote-splitting in index_body Eric Wong
2020-01-03  8:46 ` [PATCH 5/6] searchidx: index_text: use Xapian parameter names Eric Wong
2020-01-03  8:46 ` [PATCH 6/6] searchidx: remove_message: pedantic fix for v1 Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200103084603.8405-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).