For 0.3 - cleaned up patches rebased on origin/master

diff --git a/d0/ed26328fe0043807070cbdecec578d876aa1ee b/d0/ed26328fe0043807070cbdecec578d876aa1ee
new file mode 100644 (file)
index 0000000..dc22109
--- /dev/null
+++ b/d0/ed26328fe0043807070cbdecec578d876aa1ee
@@ -0,0 +1,65 @@
+Return-Path: <hohndel@gr8dns.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 E062D4196F0\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 12:58:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.001\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5\r
+       tests=[BAYES_40=-0.001] 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 ptNCGsJsCMSQ for <notmuch@notmuchmail.org>;\r
+       Mon, 26 Apr 2010 12:58:46 -0700 (PDT)\r
+Received: from mail.hohndel.org (mail.hohndel.org [65.23.157.147])\r
+       by olra.theworths.org (Postfix) with ESMTP id C273A431FC1\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 12:58:46 -0700 (PDT)\r
+Received: by mail.hohndel.org (Postfix, from userid 112)\r
+       id B23B3340FD; Mon, 26 Apr 2010 15:58:45 -0400 (EDT)\r
+Received: from x200.gr8dns.org (unknown [65.23.157.147])\r
+       by mail.hohndel.org (Postfix) with ESMTP id 66B37340E2\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 15:58:42 -0400 (EDT)\r
+Received: by x200.gr8dns.org (Postfix, from userid 500)\r
+       id 44C6DCC904; Mon, 26 Apr 2010 12:58:42 -0700 (PDT)\r
+From: Dirk Hohndel <hohndel@infradead.org>\r
+To: <notmuch@notmuchmail.org>\r
+Subject: For 0.3 - cleaned up patches rebased on origin/master\r
+Date: Mon, 26 Apr 2010 12:58:33 -0700\r
+Message-Id: <1272311915-30575-1-git-send-email-hohndel@infradead.org>\r
+X-Mailer: git-send-email 1.6.6.1\r
+In-Reply-To: <m3sk6lcu9c.fsf@x200.gr8dns.org>\r
+References: <m3sk6lcu9c.fsf@x200.gr8dns.org>\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: Mon, 26 Apr 2010 19:58:48 -0000\r
+\r
+\r
+Carl, \r
+\r
+based on your comment on IRC I have rebased this patch to the current\r
+origin/master and split it in two parts, one that makes the Received: header\r
+special when getting headers from a message file, and one that changes the\r
+heuristic by which we guess the best From: header. This passes the tests that\r
+have been committed last week.\r
+\r
+I tried to get git send-email to make this a reply to the previous version of\r
+this patch...\r
+\r
+/D\r
+\r
+-- \r
+Dirk Hohndel\r
+Intel Open Source Technology Center\r