help: move column config discovery to help.c library
When a git_config() call was added indbfae68969
(help: reuse print_columns() for help -a, 2012-04-13) to read the column config we'd always use the resulting "colopts" variable. Then in63eae83f8f
(help: add "-a --verbose" to list all commands with synopsis, 2018-05-20) we started only using the "colopts" config under "--all" if "--no-verbose" was also given, but the "git_config()" call was not moved inside the "verbose" branch of the code. This change effectively does that, we'll only call list_commands() under "--all --no-verbose", so let's have it look up the config it needs. See26c7d06783
(help -a: improve and make --verbose default, 2018-09-29) for another case in help.c where we look up config. The get_colopts() function is named for consistency with the existing get_alias() function added in26c7d06783
. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
a9bacccae5
commit
06fa4db3f7
2
help.h
2
help.h
@ -37,7 +37,7 @@ void add_cmdname(struct cmdnames *cmds, const char *name, int len);
|
||||
/* Here we require that excludes is a sorted list. */
|
||||
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
|
||||
int is_in_cmdlist(struct cmdnames *cmds, const char *name);
|
||||
void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
|
||||
void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds);
|
||||
void get_version_info(struct strbuf *buf, int show_build_options);
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user