Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- contrib/completion/git-completion.bash | 2 +- git.c | 2 ++ help.c | 15 +++++++++++++++ help.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c7957f0a90..e0f545819d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -833,7 +833,7 @@ __git_commands () { then printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}" else - git help -a|egrep '^ [a-zA-Z0-9]' + git --list-cmds=all fi } diff --git a/git.c b/git.c index f350002260..2e0c5e17e2 100644 --- a/git.c +++ b/git.c @@ -208,6 +208,8 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) } else if (skip_prefix(cmd, "--list-cmds=", &cmd)) { if (!strcmp(cmd, "builtins")) list_builtins(); + else if (!strcmp(cmd, "all")) + list_all_cmds(); else die("unsupported command listing type '%s'", cmd); exit(0); diff --git a/help.c b/help.c index 60071a9bea..f3f35dfbb1 100644 --- a/help.c +++ b/help.c @@ -228,6 +228,21 @@ void list_common_cmds_help(void) } } +void list_all_cmds(void) +{ + struct cmdnames main_cmds, other_cmds; + int i; + + memset(&main_cmds, 0, sizeof(main_cmds)); + memset(&other_cmds, 0, sizeof(other_cmds)); + load_command_list("git-", &main_cmds, &other_cmds); + + for (i = 0; i < main_cmds.cnt; i++) + puts(main_cmds.names[i]->name); + for (i = 0; i < other_cmds.cnt; i++) + puts(other_cmds.names[i]->name); +} + int is_in_cmdlist(struct cmdnames *c, const char *s) { int i; diff --git a/help.h b/help.h index b21d7c94e8..0bf29f8dc5 100644 --- a/help.h +++ b/help.h @@ -17,6 +17,7 @@ static inline void mput_char(char c, unsigned int num) } extern void list_common_cmds_help(void); +extern void list_all_cmds(void); extern const char *help_unknown_cmd(const char *cmd); extern void load_command_list(const char *prefix, struct cmdnames *main_cmds, -- 2.17.0.rc0.348.gd5a49e0b6f