From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:27 +0000 (+0900)
Subject: Merge branch 'js/misc-doc-fixes'
X-Git-Tag: v2.22.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/caa227ff458f34155ef4e974ba9e57c857c02c01

Merge branch 'js/misc-doc-fixes'

"make check-docs", "git help -a", etc. did not account for cases
where a particular build may deliberately omit some subcommands,
which has been corrected.

* js/misc-doc-fixes:
Turn `git serve` into a test helper
test-tool: handle the `-C <directory>` option just like `git`
check-docs: do not bother checking for legacy scripts' documentation
docs: exclude documentation for commands that have been excluded
check-docs: allow command-list.txt to contain excluded commands
help -a: do not list commands that are excluded from the build
Makefile: drop the NO_INSTALL variable
remote-testgit: move it into the support directory for t5801
---

caa227ff458f34155ef4e974ba9e57c857c02c01
diff --cc Documentation/.gitignore
index bf2bf271b5,ea27148c59..9022d48355
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@@ -13,4 -13,4 +13,5 @@@ mergetools-*.tx
  manpage-base-url.xsl
  SubmittingPatches.txt
  tmp-doc-diff/
 +GIT-ASCIIDOCFLAGS
+ /GIT-EXCLUDED-PROGRAMS
diff --cc Makefile
index 9f1b6e8926,9ce62fa295..5143cab9bd
--- a/Makefile
+++ b/Makefile
@@@ -613,9 -633,9 +614,8 @@@ SCRIPT_SH += git-merge-one-file.s
  SCRIPT_SH += git-merge-resolve.sh
  SCRIPT_SH += git-mergetool.sh
  SCRIPT_SH += git-quiltimport.sh
 -SCRIPT_SH += git-legacy-rebase.sh
 +SCRIPT_SH += git-legacy-stash.sh
- SCRIPT_SH += git-remote-testgit.sh
  SCRIPT_SH += git-request-pull.sh
 -SCRIPT_SH += git-stash.sh
  SCRIPT_SH += git-submodule.sh
  SCRIPT_SH += git-web--browse.sh
  
@@@ -1613,7 -1596,7 +1612,8 @@@ ifdef NO_INET_PTO
  	BASIC_CFLAGS += -DNO_INET_PTON
  endif
  ifdef NO_UNIX_SOCKETS
 +	BASIC_CFLAGS += -DNO_UNIX_SOCKETS
+ 	EXCLUDED_PROGRAMS += git-credential-cache git-credential-cache--daemon
  else
  	LIB_OBJS += unix-socket.o
  	PROGRAM_OBJS += credential-cache.o
diff --cc t/helper/test-tool.c
index 53c06932c4,4bf3666b43..087a8c0cc9
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@@ -1,6 -1,11 +1,12 @@@
  #include "git-compat-util.h"
  #include "test-tool.h"
 +#include "trace2.h"
+ #include "parse-options.h"
+ 
+ static const char * const test_tool_usage[] = {
+ 	"test-tool [-C <directory>] <command [<arguments>...]]",
+ 	NULL
+ };
  
  struct test_cmd {
  	const char *name;