From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] push: comment on a funny unbalanced option help
Date: Thu, 2 Aug 2018 18:50:58 +0200 [thread overview]
Message-ID: <e18e9ebb-a78c-150c-9e63-e9249eb2e96d@web.de> (raw)
In-Reply-To: <xmqqftzw4weq.fsf@gitster-ct.c.googlers.com>
Am 02.08.2018 um 17:31 schrieb Junio C Hamano:
> René Scharfe <l.s.r@web.de> writes:
>> diff --git a/parse-options.c b/parse-options.c
>> index 7db84227ab..fadfc6a833 100644
>> --- a/parse-options.c
>> +++ b/parse-options.c
>> @@ -660,7 +660,8 @@ int parse_options(int argc, const char **argv, const char *prefix,
>> static int usage_argh(const struct option *opts, FILE *outfile)
>> {
>> const char *s;
>> - int literal = (opts->flags & PARSE_OPT_LITERAL_ARGHELP) || !opts->argh;
>> + int literal = (opts->flags & PARSE_OPT_LITERAL_ARGHELP) || !opts->argh ||
>> + (opts->argh[0] == '<' && strchr(opts->argh, '>'));
>
> You are greedier than what I thought ;-) I would have limited this
> magic to the case where argh is surrounded by "<>", but you allow
> one closing ">" anywhere, which allows us to grab more complex cases.
That's what I had initially, but only one of the current cases would
have benefited from that strict behavior, so it's not useful enough.
> The lack of escape hatch to decline this auto-literal magic makes me
> somewhat nervous, but I do not offhand think of a reason why I do
> want an arg-help string that _begins_ with '<' to be enclosed by
> another set of "<>", so perhaps this is a good kind of magic.
The escape hatch is to add the extra pair manually to the argh string.
René
next prev parent reply other threads:[~2018-08-02 16:51 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 [this message]
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 ` [PATCH 5/6] shortlog: correct option help for -w René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e18e9ebb-a78c-150c-9e63-e9249eb2e96d@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).