Re: [PATCH 1/2] cli: fix top level --help combined with other options

diff --git a/c3/6baa814f792cc512a0cb3d0966eedb61f96252 b/c3/6baa814f792cc512a0cb3d0966eedb61f96252
new file mode 100644 (file)
index 0000000..f2fc7f6
--- /dev/null
+++ b/c3/6baa814f792cc512a0cb3d0966eedb61f96252
@@ -0,0 +1,66 @@
+Return-Path: <david@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 3FD1C431FBD\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Mar 2015 00:09:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 wt-CCrjYCHIn for <notmuch@notmuchmail.org>;\r
+       Mon,  9 Mar 2015 00:09:03 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 41772431FBC\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Mar 2015 00:09:03 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <david@tethera.net>)\r
+       id 1YUrmI-0002jg-96; Mon, 09 Mar 2015 07:07:02 +0000\r
+Received: (nullmailer pid 6159 invoked by uid 1000); Mon, 09 Mar 2015\r
+       07:06:49 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] cli: fix top level --help combined with other options\r
+In-Reply-To: <1425831535-15920-1-git-send-email-jani@nikula.org>\r
+References: <1425831535-15920-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.19+67~gdbe9924 (http://notmuchmail.org) Emacs/24.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 09 Mar 2015 08:06:49 +0100\r
+Message-ID: <87egoytzsm.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 09 Mar 2015 07:09:06 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+\r
+> -    ret = notmuch_help_command (NULL, argc - 1, &argv[1]);\r
+> +    /*\r
+> +     * Pass the first positional argument as argv[1] so the help\r
+> +     * command can give help for it. The help command ignores the\r
+> +     * argv[0] passed to it.\r
+> +     */\r
+> +    ret = notmuch_help_command (NULL, argc - opt_index + 1,\r
+> +                                argv + opt_index - 1);\r
+>      goto DONE;\r
+>      }\r
+\r
+LGTM\r