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

diff --git a/a4/9c6d938890908967de963e74d73d201dbf76e5 b/a4/9c6d938890908967de963e74d73d201dbf76e5
new file mode 100644 (file)
index 0000000..f75c299
--- /dev/null
+++ b/a4/9c6d938890908967de963e74d73d201dbf76e5
@@ -0,0 +1,72 @@
+Return-Path: <tomi.ollila@iki.fi>\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 84C46431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Mar 2015 01:04:13 -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 cEIcig4d4-NC for <notmuch@notmuchmail.org>;\r
+       Tue, 10 Mar 2015 01:04:10 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 33E75431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Mar 2015 01:04:10 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 6C554100033;\r
+       Tue, 10 Mar 2015 10:03:44 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, Jani Nikula <jani@nikula.org>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] cli: fix top level --help combined with other options\r
+In-Reply-To: <87egoytzsm.fsf@maritornes.cs.unb.ca>\r
+References: <1425831535-15920-1-git-send-email-jani@nikula.org>\r
+       <87egoytzsm.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 10 Mar 2015 10:03:44 +0200\r
+Message-ID: <m2twxtb7of.fsf@guru.guru-group.fi>\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: Tue, 10 Mar 2015 08:04:13 -0000\r
+\r
+On Mon, Mar 09 2015, David Bremner <david@tethera.net> wrote:\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
+\r
+Also to me, too.\r
+\r
+Tomi\r