From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id E9F406DE0A5B for ; Sun, 27 Aug 2017 16:58:35 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.011, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NFK_DUc167Dm for ; Sun, 27 Aug 2017 16:58:34 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 9A3846DE00D2 for ; Sun, 27 Aug 2017 16:58:34 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1dm7OK-00051k-Kr; Sun, 27 Aug 2017 19:54:56 -0400 Received: (nullmailer pid 27227 invoked by uid 1000); Sun, 27 Aug 2017 23:58:29 -0000 From: David Bremner To: Mark Walters , 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 Message-Id: <20170827235823.27177-4-david@tethera.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170827235823.27177-1-david@tethera.net> References: <1503859703-2973-1-git-send-email-markwalters1009@gmail.com> <20170827235823.27177-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Aug 2017 23:58:36 -0000 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 < EXPECTED thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; message 0 (inbox unread) EOF -- 2.13.2