lib: Remove condition regarding a NULL parent_thread_id.

A recent change guaranteed that a message ID can never be resolved
to a NULL thread ID, so we don't need this extra case.

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/database.cc b/lib/database.cc
index ff6f100d..6842fafa 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1321,15 +1321,13 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
 							     message,
 							     parent_message_id);
 
-	if (parent_thread_id != NULL) {
-	    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;
 	}
     }