From c567ce2aaae9f8c84b263185011c0cc1acc4363e Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Wed, 8 Apr 2015 23:14:00 +0900
Subject: [PATCH] [PATCH] fixup! cli: add standard option processing to config,
 help and setup

---
 3a/b3dba1fa9ab4cf2bd0fe06fee520d264d75313 | 75 +++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 3a/b3dba1fa9ab4cf2bd0fe06fee520d264d75313

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