# [PATCH] grep: reject --no-or 2 messages from 2023-09-07 to 2023-09-07. Participants: René Scharfe, Junio C Hamano. Thread: https://gitlist.dev/t/60205 ## René Scharfe, 2023-09-07 20:20 Subject: [PATCH] grep: reject --no-or Message-ID: <6aeb0ebe-0fea-ccd3-089a-ee0b5b5baf10@web.de> URL: https://gitlist.dev/e/6aeb0ebe-0fea-ccd3-089a-ee0b5b5baf10%40web.de ``` 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 --- 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 ``` ## Junio C Hamano, 2023-09-07 20:34 Subject: Re: [PATCH] grep: reject --no-or Message-ID: URL: https://gitlist.dev/e/xmqqh6o5k9ht.fsf%40gitster.g In-Reply-To: <6aeb0ebe-0fea-ccd3-089a-ee0b5b5baf10@web.de> ``` René Scharfe 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 > --- > 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 ```