* [PATCH] grep: reject --no-or
@ 2023-09-07 20:20 René Scharfe
2023-09-07 20:34 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2023-09-07 20:20 UTC (permalink / raw)
To: Git List
Since 3e230fa1b2 (grep: use parseopt, 2009-05-07) git grep has been
accepting the option --no-or. It does the same as --or: nothing.
That's confusing and unintended. Forbid negating --or.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
builtin/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 50e712a184..2a261074f1 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -990,7 +990,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
OPT_CALLBACK_F(0, "and", &opt, NULL,
N_("combine patterns specified with -e"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback),
- OPT_BOOL(0, "or", &dummy, ""),
+ OPT_BOOL_F(0, "or", &dummy, "", PARSE_OPT_NONEG),
OPT_CALLBACK_F(0, "not", &opt, NULL, "",
PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback),
OPT_CALLBACK_F('(', NULL, &opt, NULL, "",
--
2.42.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] grep: reject --no-or
2023-09-07 20:20 [PATCH] grep: reject --no-or René Scharfe
@ 2023-09-07 20:34 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2023-09-07 20:34 UTC (permalink / raw)
To: René Scharfe; +Cc: Git List
René Scharfe <l.s.r@web.de> writes:
> Since 3e230fa1b2 (grep: use parseopt, 2009-05-07) git grep has been
> accepting the option --no-or. It does the same as --or: nothing.
> That's confusing and unintended. Forbid negating --or.
OK. It is just a no-op Boolean but that is not a good reason for us
to be loose. Will queue. Thanks.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> builtin/grep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 50e712a184..2a261074f1 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -990,7 +990,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> OPT_CALLBACK_F(0, "and", &opt, NULL,
> N_("combine patterns specified with -e"),
> PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback),
> - OPT_BOOL(0, "or", &dummy, ""),
> + OPT_BOOL_F(0, "or", &dummy, "", PARSE_OPT_NONEG),
> OPT_CALLBACK_F(0, "not", &opt, NULL, "",
> PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback),
> OPT_CALLBACK_F('(', NULL, &opt, NULL, "",
> --
> 2.42.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-07 20:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-07 20:20 [PATCH] grep: reject --no-or René Scharfe
2023-09-07 20:34 ` Junio C Hamano
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).