lib: Remove condition regarding a NULL parent_thread_id.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 415b0d77c3439abb9165d8236c5106d3f1cfffee..6842fafadad86967b4363abd5869a2aeaef345c2 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1313,22 +1313,21 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
        const char *parent_thread_id;
 
        parent_message_id = (char *) l->data;
+
+       _notmuch_message_add_term (message, "reference",
+                                  parent_message_id);
+
        parent_thread_id = _resolve_message_id_to_thread_id (notmuch,
                                                             message,
                                                             parent_message_id);
 
-       if (parent_thread_id == NULL) {
-           _notmuch_message_add_term (message, "reference",
-                                      parent_message_id);
-       } else {
-           if (*thread_id == NULL) {
-               *thread_id = talloc_strdup (message, parent_thread_id);
-               _notmuch_message_add_term (message, "thread", *thread_id);
-           } else if (strcmp (*thread_id, parent_thread_id)) {
-               ret = _merge_threads (notmuch, *thread_id, parent_thread_id);
-               if (ret)
-                   goto DONE;
-           }
+       if (*thread_id == NULL) {
+           *thread_id = talloc_strdup (message, parent_thread_id);
+           _notmuch_message_add_term (message, "thread", *thread_id);
+       } else if (strcmp (*thread_id, parent_thread_id)) {
+           ret = _merge_threads (notmuch, *thread_id, parent_thread_id);
+           if (ret)
+               goto DONE;
        }
     }