git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Subject: [PATCH 5/6] shortlog: correct option help for -w
Date: Thu, 2 Aug 2018 21:18:06 +0200	[thread overview]
Message-ID: <4e96d2a2-dfdc-3f6f-e2c7-2eb954ed633c@web.de> (raw)
In-Reply-To: <ad2d8f99-07a3-0191-88a2-c43081657988@web.de>

Wrap the placeholders in the option help string for -w in pairs of
angular brackets to document that users need to replace them with actual
numbers.  Use the flag PARSE_OPT_LITERAL_ARGHELP to prevent parseopt
from adding another pair.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
 builtin/shortlog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 608d6ba77b..f555cf9e4f 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -268,8 +268,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 			 N_("Suppress commit descriptions, only provides commit count")),
 		OPT_BOOL('e', "email", &log.email,
 			 N_("Show the email address of each author")),
-		{ OPTION_CALLBACK, 'w', NULL, &log, N_("w[,i1[,i2]]"),
-			N_("Linewrap output"), PARSE_OPT_OPTARG, &parse_wrap_args },
+		{ OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
+			N_("Linewrap output"),
+			PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
+			&parse_wrap_args },
 		OPT_END(),
 	};
 
-- 
2.18.0

  parent reply	other threads:[~2018-08-02 19:18 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-01 18:43 [PATCH] push: comment on a funny unbalanced option help Junio C Hamano
2018-08-01 20:46 ` Ævar Arnfjörð Bjarmason
2018-08-01 21:48   ` Junio C Hamano
2018-08-01 22:31     ` Ævar Arnfjörð Bjarmason
2018-08-02 12:16       ` René Scharfe
2018-08-02 14:21         ` Ævar Arnfjörð Bjarmason
2018-08-02 15:06           ` René Scharfe
2018-08-02 15:16             ` René Scharfe
2018-08-02 15:24           ` Junio C Hamano
2018-08-02 15:31         ` Junio C Hamano
2018-08-02 16:50           ` René Scharfe
2018-08-02 16:54           ` Jeff King
2018-08-02 18:46             ` René Scharfe
2018-08-02 19:17               ` [PATCH 1/6] add, update-index: fix --chmod argument help René Scharfe
2018-08-02 20:41                 ` Ævar Arnfjörð Bjarmason
2018-08-02 20:59                 ` Ramsay Jones
2018-08-02 21:17                   ` Junio C Hamano
2018-08-02 21:04                 ` Andrei Rybak
2018-08-02 21:16                   ` Junio C Hamano
2018-08-02 19:17               ` [PATCH 2/6] difftool: remove angular brackets from " René Scharfe
2018-08-02 19:17               ` [PATCH 3/6] pack-objects: specify --index-version argument help explicitly René Scharfe
2018-08-02 19:17               ` [PATCH 4/6] send-pack: specify --force-with-lease " René Scharfe
2018-08-02 19:18               ` René Scharfe [this message]
2018-08-02 19:18               ` [PATCH 6/6] parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP René Scharfe
2018-08-02 20:05                 ` Junio C Hamano
2018-08-03  8:13                 ` Kerry, Richard
2018-08-03 10:39                 ` Kerry, Richard
2018-08-02 20:01               ` [PATCH] push: comment on a funny unbalanced option help Junio C Hamano
2018-08-02 22:38                 ` René Scharfe
2018-08-03 15:29                   ` Junio C Hamano
2018-08-02 15:44     ` Re* " Junio C Hamano
2018-08-02 15:59       ` René Scharfe
2018-08-02 16:23         ` Junio C Hamano
2018-08-02 20:33           ` Ævar Arnfjörð Bjarmason
2018-08-02 20:36             ` Junio C Hamano
2018-08-03  4:42               ` René Scharfe
2018-08-03 15:30                 ` Junio C Hamano
2018-08-01 22:57 ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4e96d2a2-dfdc-3f6f-e2c7-2eb954ed633c@web.de \
    --to=l.s.r@web.de \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).