From: David Bremner <david@tethera.net>
To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
Subject: [PATCH 4/5] lib: enforce that n_message_reindex takes headers from first file
Date: Sun, 27 Aug 2017 20:58:22 -0300 [thread overview]
Message-ID: <20170827235823.27177-4-david@tethera.net> (raw)
In-Reply-To: <20170827235823.27177-1-david@tethera.net>
This is still a bit stopgap to be only choosing one set of headers,
but this seems like a more defensible set of headers to choose.
---
lib/message.cc | 4 +++-
test/T670-duplicate-mid.sh | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 98a88d3a..051362d4 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -2012,7 +2012,9 @@ notmuch_message_reindex (notmuch_message_t *message,
thread_id = orig_thread_id;
_notmuch_message_add_term (message, "thread", thread_id);
- _notmuch_message_set_header_values (message, date, from, subject);
+ /* Take header values only from first filename */
+ if (found == 0)
+ _notmuch_message_set_header_values (message, date, from, subject);
ret = _notmuch_message_index_file (message, message_file);
diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh
index d4c1d1c2..ce010cf7 100755
--- a/test/T670-duplicate-mid.sh
+++ b/test/T670-duplicate-mid.sh
@@ -41,7 +41,6 @@ notmuch search --output=files "sekrit" | notmuch_dir_sanitize > OUTPUT
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest 'reindex choses subject from first filename'
-test_subtest_known_broken
cat <<EOF > EXPECTED
thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; message 0 (inbox unread)
EOF
--
2.13.2
next prev parent reply other threads:[~2017-08-27 23:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-27 9:45 Duplicate message ids Mark Walters
2017-08-27 13:19 ` [PATCH] test: check for subject consistency between search and show David Bremner
2017-08-27 18:48 ` [PATCH] test: duplicate mids: add an extra broken search test Mark Walters
2017-08-27 23:58 ` [PATCH 1/5] test: make fallback to duplicate test more robust David Bremner
2017-08-27 23:58 ` [PATCH 2/5] test/duplicate-mid: clarify index order vs filename order David Bremner
2017-08-27 23:58 ` [PATCH 3/5] test: known broken test for subject after reindexing David Bremner
2017-08-27 23:58 ` David Bremner [this message]
2017-08-27 23:58 ` [PATCH 5/5] test/duplicate-mid: check for subject with notmuch-show David Bremner
2017-09-06 1:29 ` [PATCH 1/5] test: make fallback to duplicate test more robust David Bremner
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://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170827235823.27177-4-david@tethera.net \
--to=david@tethera.net \
--cc=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.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://yhetil.org/notmuch.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).