From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Jun 2018 06:06:37 +0000 (+0900)
Subject: Merge branch 'nd/command-list'
X-Git-Tag: v2.18.0-rc1~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2289880f784326dc955f213072164539dcaf445e

Merge branch 'nd/command-list'

The list of commands with their various attributes were spread
across a few places in the build procedure, but it now is getting a
bit more consolidated to allow more automation.

* nd/command-list:
completion: allow to customize the completable command list
completion: add and use --list-cmds=alias
completion: add and use --list-cmds=nohelpers
Move declaration for alias.c to alias.h
completion: reduce completable command list
completion: let git provide the completable command list
command-list.txt: documentation and guide line
help: use command-list.txt for the source of guides
help: add "-a --verbose" to list all commands with synopsis
git: support --list-cmds=list-<category>
completion: implement and use --list-cmds=main,others
git --list-cmds: collect command list in a string_list
git.c: convert --list-* to --list-cmds=*
Remove common-cmds.h
help: use command-list.h for common command list
generate-cmds.sh: export all commands to command-list.h
generate-cmds.sh: factor out synopsis extract code
---

2289880f784326dc955f213072164539dcaf445e
diff --cc command-list.txt
index 835c5890be,e505a1e34c..e1c26c1bb7
--- a/command-list.txt
+++ b/command-list.txt
@@@ -34,9 -69,8 +69,9 @@@ git-clea
  git-clone                               mainporcelain           init
  git-column                              purehelpers
  git-commit                              mainporcelain           history
 +git-commit-graph                        plumbingmanipulators
  git-commit-tree                         plumbingmanipulators
- git-config                              ancillarymanipulators
+ git-config                              ancillarymanipulators           complete
  git-count-objects                       ancillaryinterrogators
  git-credential                          purehelpers
  git-credential-cache                    purehelpers
diff --cc connect.c
index 31aa9c8433,ff078d28dc..968e91b18c
--- a/connect.c
+++ b/connect.c
@@@ -12,11 -12,10 +12,12 @@@
  #include "sha1-array.h"
  #include "transport.h"
  #include "strbuf.h"
 +#include "version.h"
  #include "protocol.h"
+ #include "alias.h"
  
 -static char *server_capabilities;
 +static char *server_capabilities_v1;
 +static struct argv_array server_capabilities_v2 = ARGV_ARRAY_INIT;
  static const char *parse_feature_value(const char *, const char *, int *);
  
  static int check_ref(const char *name, unsigned int flags)
diff --cc git.c
index 5771d62a32,447dac0e71..c2f48d53dd
--- a/git.c
+++ b/git.c
@@@ -1,8 -1,9 +1,9 @@@
  #include "builtin.h"
  #include "config.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "help.h"
  #include "run-command.h"
+ #include "alias.h"
  
  #define RUN_SETUP		(1<<0)
  #define RUN_SETUP_GENTLY	(1<<1)
diff --cc sequencer.c
index 72b4d8ecae,1288a36ebd..560fc9b67d
--- a/sequencer.c
+++ b/sequencer.c
@@@ -23,10 -23,7 +23,11 @@@
  #include "hashmap.h"
  #include "notes-utils.h"
  #include "sigchain.h"
 +#include "unpack-trees.h"
 +#include "worktree.h"
 +#include "oidmap.h"
 +#include "oidset.h"
+ #include "alias.h"
  
  #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
  
diff --cc shell.c
index 0200d10796,3ce77b8e34..40084a3013
--- a/shell.c
+++ b/shell.c
@@@ -1,8 -1,9 +1,9 @@@
  #include "cache.h"
  #include "quote.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "strbuf.h"
  #include "run-command.h"
+ #include "alias.h"
  
  #define COMMAND_DIR "git-shell-commands"
  #define HELP_COMMAND COMMAND_DIR "/help"