From: Junio C Hamano <gitster@pobox•com>
To: Johan Herland <johan@herland•net>
Cc: git@vger•kernel.org, "Pierre Habouzit" <madcoder@debian•org>,
"Jonathan Nieder" <jrnieder@gmail•com>,
"René Scharfe" <l.s.r@web•de>
Subject: [PATCH] parse-options: detect attempt to add a duplicate short option name
Date: Wed, 03 Sep 2014 12:42:37 -0700 [thread overview]
Message-ID: <xmqq1trsxzgy.fsf_-_@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq7g1kxzxi.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 03 Sep 2014 12:32:41 -0700")
Junio C Hamano <gitster@pobox•com> writes:
>> diff --git a/builtin/revert.c b/builtin/revert.c
>> index f9ed5bd..831c2cd 100644
>> --- a/builtin/revert.c
>> +++ b/builtin/revert.c
>> @@ -91,6 +91,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
>> N_("option for merge strategy"), option_parse_x),
>> { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"),
>> N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
>> + OPT_BOOL('n', "no-verify", &opts->no_verify, N_("bypass pre-commit hook")),
>
> I doubt we want this option to squat on '-n'; besides, it is already
> taken by a more often used "--no-commit".
>
> I thought that we added sanity checker for the options[] array to parse-options
> API. I wonder why it did not kick in...
... because we didn't, not quite.
Perhaps like this?
-- >8 --
It is easy to overlook an already assigned single-letter option name
and try to use it for a new one. Help the developer to catch it
before such a mistake escapes the lab.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
diff --git a/parse-options.c b/parse-options.c
index e7dafa8..b7925c5 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -347,12 +347,17 @@ static void check_typos(const char *arg, const struct option *options)
static void parse_options_check(const struct option *opts)
{
int err = 0;
+ char short_opts[128];
+
+ memset(short_opts, '\0', sizeof(short_opts));
for (; opts->type != OPTION_END; opts++) {
if ((opts->flags & PARSE_OPT_LASTARG_DEFAULT) &&
(opts->flags & PARSE_OPT_OPTARG))
err |= optbug(opts, "uses incompatible flags "
"LASTARG_DEFAULT and OPTARG");
+ if (opts->short_name && short_opts[opts->short_name]++)
+ err |= optbug(opts, "short name already used");
if (opts->flags & PARSE_OPT_NODASH &&
((opts->flags & PARSE_OPT_OPTARG) ||
!(opts->flags & PARSE_OPT_NOARG) ||
next prev parent reply other threads:[~2014-09-03 19:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 14:03 [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Johan Herland
2014-09-03 14:03 ` [RFC/PATCH 1/3] t7503/4: Add failing testcases for revert/cherry-pick --no-verify Johan Herland
2014-09-03 19:28 ` Junio C Hamano
2014-09-03 14:03 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 19:32 ` Junio C Hamano
2014-09-03 19:42 ` Junio C Hamano [this message]
2014-09-03 20:29 ` [PATCH] parse-options: detect attempt to add a duplicate short option name René Scharfe
2014-09-03 21:05 ` Junio C Hamano
2014-09-03 21:46 ` René Scharfe
2014-09-03 22:16 ` Junio C Hamano
2014-09-04 6:13 ` René Scharfe
2014-09-04 17:24 ` Junio C Hamano
2014-09-04 18:07 ` Junio C Hamano
2014-09-03 21:46 ` Jonathan Nieder
2014-09-03 21:58 ` Jonathan Nieder
2014-09-04 8:34 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 14:03 ` [RFC/PATCH 3/3] revert/cherry-pick --no-verify: Update documentation Johan Herland
2014-09-03 19:21 ` [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Junio C Hamano
2014-09-05 21:05 ` Fabian Ruch
2014-09-08 15:13 ` Johan Herland
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=xmqq1trsxzgy.fsf_-_@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johan@herland$(echo .)net \
--cc=jrnieder@gmail$(echo .)com \
--cc=l.s.r@web$(echo .)de \
--cc=madcoder@debian$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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