[PATCH] fix obvious cut and paste error

diff --git a/69/a2546134fc5694395444cc1edd50c38924eaf0 b/69/a2546134fc5694395444cc1edd50c38924eaf0
new file mode 100644 (file)
index 0000000..02fad71
--- /dev/null
+++ b/69/a2546134fc5694395444cc1edd50c38924eaf0
@@ -0,0 +1,77 @@
+Return-Path: <BATV+3d395db9405134d2e00f+2417+infradead.org+hohndel@bombadil.srs.infradead.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8E3F24196F4\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Apr 2010 15:36:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -4.2\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-4.2 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id fmSYA5gqTKRk for <notmuch@notmuchmail.org>;\r
+       Tue,  6 Apr 2010 15:36:26 -0700 (PDT)\r
+Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2BE0B4196F0\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Apr 2010 15:36:26 -0700 (PDT)\r
+Received: from localhost ([::1] helo=localhost.localdomain)\r
+       by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux))\r
+       id 1NzHNh-00055S-Kd\r
+       for notmuch@notmuchmail.org; Tue, 06 Apr 2010 22:36:25 +0000\r
+Received: by localhost.localdomain (Postfix, from userid 500)\r
+       id 1ED1DC00DB; Tue,  6 Apr 2010 15:36:25 -0700 (PDT)\r
+From: Dirk Hohndel <hohndel@infradead.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] fix obvious cut and paste error\r
+Date: Tue, 06 Apr 2010 15:36:25 -0700\r
+Message-ID: <m3k4skxl7a.fsf@x200.gr8dns.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-SRS-Rewrite: SMTP reverse-path rewritten from <hohndel@infradead.org> by\r
+       bombadil.infradead.org See http://www.infradead.org/rpr.html\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 06 Apr 2010 22:36:27 -0000\r
+\r
+\r
+the wrong variable is checked for success of an allocation\r
+\r
+Signed-off-by: Dirk Hohndel <hohndel@infradead.org>\r
+---\r
+ lib/thread.cc |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 1c8b39d..48c070e 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -236,7 +236,7 @@ _notmuch_thread_create (void *ctx,\r
+       return NULL;\r
+ \r
+     matched_query = notmuch_query_create (notmuch, matched_query_string);\r
+-    if (unlikely (thread_id_query == NULL))\r
++    if (unlikely (matched_query == NULL))\r
+       return NULL;\r
+ \r
+     thread = talloc (ctx, notmuch_thread_t);\r
+-- \r
+1.6.6.1\r
+\r
+\r
+\r
+-- \r
+Dirk Hohndel\r
+Intel Open Source Technology Center\r