]> granicus.if.org Git - git/commitdiff
Merge branch 'js/misc-doc-fixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:27 +0000 (00:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:27 +0000 (00:37 +0900)
"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

1  2 
.gitignore
Documentation/.gitignore
Documentation/Makefile
Makefile
builtin.h
git.c
t/helper/test-tool.c
t/helper/test-tool.h
t/t5702-protocol-v2.sh
t/t5703-upload-pack-ref-in-want.sh

diff --cc .gitignore
Simple merge
index bf2bf271b5678895e94810dcbdca12b0dfb7de91,ea27148c598f925600f00f1af79f58fc9034f1a4..9022d4835545cbf40c9537efa8ca9a7678e42673
@@@ -13,4 -13,4 +13,5 @@@ mergetools-*.tx
  manpage-base-url.xsl
  SubmittingPatches.txt
  tmp-doc-diff/
 +GIT-ASCIIDOCFLAGS
+ /GIT-EXCLUDED-PROGRAMS
Simple merge
diff --cc Makefile
index 9f1b6e8926682c82530baa597794544b89d88c3a,9ce62fa2958b9fe3aefcf739d1b1ab56d0a9d3d8..5143cab9bdb2b303386074877838da3741ecc76d
+++ 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 builtin.h
Simple merge
diff --cc git.c
Simple merge
index 53c06932c45c17bcb2981c9b1cc081df8135dded,4bf3666b43d318820d847e9969d00105f41c5972..087a8c0cc9da64d7bc276c3870b2d0faba4c2627
@@@ -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;
Simple merge
Simple merge
Simple merge