--- /dev/null
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id ECF986DE1989\r
+ for <notmuch@notmuchmail.org>; Wed, 8 Apr 2015 07:16:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.409\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.409 tagged_above=-999 required=5 tests=[AWL=0.399, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id WhRBQI9qsN67 for <notmuch@notmuchmail.org>;\r
+ Wed, 8 Apr 2015 07:16:10 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 5B8BC6DE1950\r
+ for <notmuch@notmuchmail.org>; Wed, 8 Apr 2015 07:16:10 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YfqkM-00059z-Ov; Wed, 08 Apr 2015 14:14:26 +0000\r
+Received: (nullmailer pid 25005 invoked by uid 1000); Wed, 08 Apr 2015\r
+ 14:14:07 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, Mark Walters\r
+ <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: [PATCH] fixup! cli: add standard option processing to config, help\r
+ and setup\r
+Date: Wed, 8 Apr 2015 23:14:00 +0900\r
+Message-Id: <1428502440-24963-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1428435042-16503-5-git-send-email-david@tethera.net>\r
+References: <1428435042-16503-5-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Wed, 08 Apr 2015 14:16:13 -0000\r
+\r
+---\r
+ test/random-corpus.c | 8 ++++++++\r
+ 1 file changed, 8 insertions(+)\r
+\r
+diff --git a/test/random-corpus.c b/test/random-corpus.c\r
+index 6c467bb..b377eb4 100644\r
+--- a/test/random-corpus.c\r
++++ b/test/random-corpus.c\r
+@@ -125,6 +125,14 @@ notmuch_process_shared_options (unused (const char *dummy))\r
+ }\r
+ \r
+ int\r
++notmuch_minimal_options (unused (const char *subcommand),\r
++ unused (int argc),\r
++ unused (char **argv))\r
++{\r
++ return 0;\r
++}\r
++\r
++int\r
+ main (int argc, char **argv)\r
+ {\r
+ \r
+-- \r
+2.1.4\r
+\r