From: "René Scharfe" <l.s.r@web•de>
To: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Subject: [PATCH 2/2] parseopt: check for duplicate long names and numerical options
Date: Fri, 27 Feb 2026 20:27:02 +0100 [thread overview]
Message-ID: <7693799a-91a2-480a-ae3e-29f8eed5b55a@web.de> (raw)
In-Reply-To: <xmqq5x7jujqb.fsf@gitster.g>
We already check for duplicate short names. Check for and report
duplicate long names and numerical options as well.
Signed-off-by: René Scharfe <l.s.r@web•de>
---
The check clearly has a cost, but I have a hard time measuring it.
We already do lots of (kinda cheap) checks. Turning them on only
in DEVELOPER builds (and ideally demonstrating a speedup) left as
an exercise for interested readers (with stronger benchmark-fu)..
parse-options.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/parse-options.c b/parse-options.c
index c9cafc21b9..51b72eee11 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -5,6 +5,7 @@
#include "gettext.h"
#include "strbuf.h"
#include "string-list.h"
+#include "strmap.h"
#include "utf8.h"
static int disallow_abbreviated_options;
@@ -641,6 +642,8 @@ static void check_typos(const char *arg, const struct option *options)
static void parse_options_check(const struct option *opts)
{
char short_opts[128];
+ struct strset long_names = STRSET_INIT;
+ bool saw_number_option = false;
void *subcommand_value = NULL;
memset(short_opts, '\0', sizeof(short_opts));
@@ -655,6 +658,16 @@ static void parse_options_check(const struct option *opts)
else if (short_opts[opts->short_name]++)
optbug(opts, "short name already used");
}
+ if (opts->long_name) {
+ if (strset_contains(&long_names, opts->long_name))
+ optbug(opts, "long name already used");
+ strset_add(&long_names, opts->long_name);
+ }
+ if (opts->type == OPTION_NUMBER) {
+ if (saw_number_option)
+ optbug(opts, "duplicate numerical option");
+ saw_number_option = true;
+ }
if (opts->flags & PARSE_OPT_NODASH &&
((opts->flags & PARSE_OPT_OPTARG) ||
!(opts->flags & PARSE_OPT_NOARG) ||
@@ -712,6 +725,7 @@ static void parse_options_check(const struct option *opts)
optbug(opts, "multi-word argh should use dash to separate words");
}
BUG_if_bug("invalid 'struct option'");
+ strset_clear(&long_names);
}
static int has_subcommands(const struct option *options)
--
2.53.0
next prev parent reply other threads:[~2026-02-27 19:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-27 0:13 [Bug] duplicated long-form options go unnoticed Junio C Hamano
2026-02-27 19:27 ` [PATCH 1/2] pack-objects: remove duplicate --stdin-packs definition René Scharfe
2026-02-27 19:27 ` René Scharfe [this message]
2026-02-27 22:50 ` [PATCH 2/2] parseopt: check for duplicate long names and numerical options Jeff King
2026-02-27 23:08 ` Jeff King
2026-02-27 23:28 ` Junio C Hamano
2026-02-28 9:19 ` René Scharfe
2026-02-28 9:19 ` [PATCH v2 " René Scharfe
2026-02-28 10:58 ` Jeff King
2026-02-28 11:28 ` René Scharfe
2026-03-02 18:24 ` Jeff King
2026-03-01 14:33 ` Junio C Hamano
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=7693799a-91a2-480a-ae3e-29f8eed5b55a@web.de \
--to=l.s.r@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/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