Re: t9902 fails
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: t9902 fails · Junio C Hamano <hidden>
- 2016-06-15 · Re: t9902 fails · Junio C Hamano <hidden>
- 2016-06-15 · Re: t9902 fails · Junio C Hamano <hidden>
- 2016-06-15 · Re: t9902 fails · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
quoted hunk
How about doing something like this and set that variable in the test instead? If STD_ONLY is not set, you will get everything, but when STD_ONLY is set, we will stop reading from "help -a" when it starts listing additional stuff. contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a4c48e1..415a078 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash@@ -534,7 +534,8 @@ __git_complete_strategy () __git_list_all_commands () { local i IFS=" "$'\n' - for i in $(git help -a|egrep '^ [a-zA-Z0-9]') + for i in $(LANG=C LC_ALL=C git help -a | + sed -n ${GIT_HELP_STD_ONLY+-e /^git.*elsewhere/q} -e '/^ [a-zA-Z0-9]/p') do case $i in *--*) : helper pattern;;
Alternatively, we could do this and replace everything inside $() with "git help --standard", but that requires the completion script update to go in sync with the core update, which is a downside. builtin/help.c | 21 +++++++++++++++++---- help.c | 3 +++ 2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c
index bd86253..e6b9b5f 100644
--- a/builtin/help.c
+++ b/builtin/help.c@@ -36,11 +36,16 @@ enum help_format { static const char *html_path; -static int show_all = 0; +#define HELP_ALL 1 +#define HELP_STANDARD 2 +static int show_what; static unsigned int colopts; static enum help_format help_format = HELP_FORMAT_NONE; static struct option builtin_help_options[] = { - OPT_BOOLEAN('a', "all", &show_all, N_("print all available commands")), + OPT_SET_INT('a', "all", &show_what, N_("print all available commands"), + HELP_ALL), + OPT_SET_INT(0, "standard", &show_what, N_("list subcommands that comes with git"), + HELP_STANDARD), OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN), OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"), HELP_FORMAT_WEB),
@@ -436,19 +441,27 @@ int cmd_help(int argc, const char **argv, const char *prefix) int nongit; const char *alias; enum help_format parsed_help_format; - load_command_list("git-", &main_cmds, &other_cmds); argc = parse_options(argc, argv, prefix, builtin_help_options, builtin_help_usage, 0); parsed_help_format = help_format; - if (show_all) { + load_command_list("git-", &main_cmds, + show_what == HELP_STANDARD ? NULL : &other_cmds); + + if (show_what == HELP_ALL) { git_config(git_help_config, NULL); printf(_("usage: %s%s"), _(git_usage_string), "\n\n"); list_commands(colopts, &main_cmds, &other_cmds); printf("%s\n", _(git_more_info_string)); return 0; } + if (show_what == HELP_STANDARD) { + int i; + for (i = 0; i < main_cmds.cnt; i++) + printf("%s\n", main_cmds.names[i]->name); + return 0; + } if (!argv[0]) { printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
diff --git a/help.c b/help.c
index 2a42ec6..3e6b04c 100644
--- a/help.c
+++ b/help.c@@ -182,6 +182,9 @@ void load_command_list(const char *prefix, uniq(main_cmds); } + if (!other_cmds) + return; + if (env_path) { char *paths, *path, *colon; path = paths = xstrdup(env_path);