mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
grep: stop using PARSE_OPT_NO_INTERNAL_HELP
The flag PARSE_OPT_NO_INTERNAL_HELP is set to allow overriding the option -h, except when it's the only one given. This is the default behavior now, so remove the flag and the hand-rolled --help-all handling. The internal --help-all handler now actually shows hidden options, i.e. --debug in this case. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
parent
5ad0d3d526
commit
4441549995
|
@ -612,11 +612,6 @@ static int pattern_callback(const struct option *opt, const char *arg,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int help_callback(const struct option *opt, const char *arg, int unset)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int cmd_grep(int argc, const char **argv, const char *prefix)
|
int cmd_grep(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
int hit = 0;
|
int hit = 0;
|
||||||
|
@ -738,18 +733,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
||||||
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
|
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
|
||||||
OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
|
OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
|
||||||
N_("allow calling of grep(1) (ignored by this build)")),
|
N_("allow calling of grep(1) (ignored by this build)")),
|
||||||
{ OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
|
|
||||||
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
|
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
* 'git grep -h', unlike 'git grep -h <pattern>', is a request
|
|
||||||
* to show usage information and exit.
|
|
||||||
*/
|
|
||||||
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
||||||
usage_with_options(grep_usage, options);
|
|
||||||
|
|
||||||
init_grep_defaults();
|
init_grep_defaults();
|
||||||
git_config(grep_cmd_config, NULL);
|
git_config(grep_cmd_config, NULL);
|
||||||
grep_init(&opt, prefix);
|
grep_init(&opt, prefix);
|
||||||
|
@ -766,8 +752,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
||||||
*/
|
*/
|
||||||
argc = parse_options(argc, argv, prefix, options, grep_usage,
|
argc = parse_options(argc, argv, prefix, options, grep_usage,
|
||||||
PARSE_OPT_KEEP_DASHDASH |
|
PARSE_OPT_KEEP_DASHDASH |
|
||||||
PARSE_OPT_STOP_AT_NON_OPTION |
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
||||||
PARSE_OPT_NO_INTERNAL_HELP);
|
|
||||||
grep_commit_pattern_type(pattern_type_arg, &opt);
|
grep_commit_pattern_type(pattern_type_arg, &opt);
|
||||||
|
|
||||||
if (use_index && !startup_info->have_repository)
|
if (use_index && !startup_info->have_repository)
|
||||||
|
|
Loading…
Reference in a new issue