diff options
| author | David Bremner <david@tethera.net> | 2021-05-15 15:40:22 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-06-26 22:39:07 -0300 |
| commit | dab32dc70c15789b188001b78b7225c61bed4784 (patch) | |
| tree | 083280978c513774cf090f2230b4497b08886b81 /lib/add-message.cc | |
| parent | 3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612 (diff) | |
lib/n_d_index_file: re-use thread-id of existing message
This prevents the message document getting multiple thread-id terms
when there are multiple files with the same message-id.
This change shifts some thread ids, requiring adjustments to other tests.
(cherry picked from commit 3f4de98e7c8c70f9a86a4f899147126f79907bd9)
Diffstat (limited to 'lib/add-message.cc')
| -rw-r--r-- | lib/add-message.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/add-message.cc b/lib/add-message.cc index 485debad..b47aa501 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -407,14 +407,17 @@ static notmuch_status_t _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file, - bool is_ghost) + bool is_ghost, + bool is_new) { void *local = talloc_new (NULL); notmuch_status_t status; const char *thread_id = NULL; /* Check if the message already had a thread ID */ - if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) { + if (! is_new) { + thread_id = notmuch_message_get_thread_id (message); + } else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) { if (is_ghost) thread_id = notmuch_message_get_thread_id (message); } else { @@ -539,7 +542,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch, } ret = _notmuch_database_link_message (notmuch, message, - message_file, is_ghost); + message_file, is_ghost, is_new); if (ret) goto DONE; |