simple fixes for notmuch-restore

diff --git a/5c/d711519a85be5a3bf03149fcf8bbc218aa6b58 b/5c/d711519a85be5a3bf03149fcf8bbc218aa6b58
new file mode 100644 (file)
index 0000000..b8e7a40
--- /dev/null
+++ b/5c/d711519a85be5a3bf03149fcf8bbc218aa6b58
@@ -0,0 +1,56 @@
+Return-Path: <bremner@tethera.net>\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 AB612431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 18:42:50 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\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 IKrSCuQfguwM for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Nov 2012 18:42:48 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D98FE431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 18:42:48 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>) id 1TYpPj-0007ea-Nq\r
+       for notmuch@notmuchmail.org; Wed, 14 Nov 2012 22:42:47 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>) id 1TYpPe-0007SZ-0G\r
+       for notmuch@notmuchmail.org; Wed, 14 Nov 2012 22:42:42 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: simple fixes for notmuch-restore\r
+Date: Wed, 14 Nov 2012 22:42:37 -0400\r
+Message-Id: <1352947359-28181-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Spam_bar: -\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: Thu, 15 Nov 2012 02:42:50 -0000\r
+\r
+Here are a couple of small fixes I noticed while working on notmuch-restore.\r
+\r
+I think the optind increment is harmless (although confusing) and the\r
+other is just correcting an error message.\r
+\r