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>
René Scharfe committed
Nov 17, 2015 at 11:25 UTC
4441549995d796084526a5ed6a6c9add7af6c665
1 file changed
+1
-16
builtin/grep.c
+1
-16
@@ -612,11 +612,6 @@ static int pattern_callback(const struct option *opt, const char *arg,
612
return 0;
613
}
614
615
-static int help_callback(const struct option *opt, const char *arg, int unset)
616
-{
617
- return -1;
618
-}
619
-
615
int cmd_grep(int argc, const char **argv, const char *prefix)
616
{
617
int hit = 0;
@@ -738,18 +733,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
733
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
734
OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
735
N_("allow calling of grep(1) (ignored by this build)")),
741
- { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
742
- PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
736
OPT_END()
737
};
738
746
- /*
747
- * 'git grep -h', unlike 'git grep -h <pattern>', is a request
748
- * to show usage information and exit.
749
- */
750
- if (argc == 2 && !strcmp(argv[1], "-h"))
751
- usage_with_options(grep_usage, options);
752
-
739
init_grep_defaults();
740
git_config(grep_cmd_config, NULL);
741
grep_init(&opt, prefix);
@@ -766,8 +752,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
752
*/
753
argc = parse_options(argc, argv, prefix, options, grep_usage,
754
PARSE_OPT_KEEP_DASHDASH |
769
- PARSE_OPT_STOP_AT_NON_OPTION |
770
- PARSE_OPT_NO_INTERNAL_HELP);
755
+ PARSE_OPT_STOP_AT_NON_OPTION);
756
grep_commit_pattern_type(pattern_type_arg, &opt);
757
758
if (use_index && !startup_info->have_repository)