From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:06:14 +0000 (-0700)
Subject: Merge branch 'jk/check-docs-update' into maint
X-Git-Tag: v1.7.12.1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e51ae8393564c4998bbc809ede7e6438efd616f?ds=inline;hp=-c

Merge branch 'jk/check-docs-update' into maint

* jk/check-docs-update:
check-docs: get documented command list from Makefile
check-docs: drop git-help special-case
check-docs: list git-gui as a command
check-docs: factor out command-list
command-list: mention git-credential-* helpers
command-list: add git-sh-i18n
check-docs: update non-command documentation list
check-docs: mention gitweb specially
---

1e51ae8393564c4998bbc809ede7e6438efd616f
diff --combined Makefile
index 6b0c961d3a,51b3c6fc9c..66e82167eb
--- a/Makefile
+++ b/Makefile
@@@ -1014,7 -1014,6 +1014,7 @@@ ifeq ($(uname_S),SunOS
  	NO_REGEX = YesPlease
  	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
 +	HAVE_DEV_TTY = YesPlease
  	ifeq ($(uname_R),5.6)
  		SOCKLEN_T = int
  		NO_HSTRERROR = YesPlease
@@@ -2805,8 -2804,13 +2805,13 @@@ endi
  
  ### Check documentation
  #
+ ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS)
+ ALL_COMMANDS += git
+ ALL_COMMANDS += gitk
+ ALL_COMMANDS += gitweb
+ ALL_COMMANDS += git-gui git-citool
  check-docs::
- 	@(for v in $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git gitk; \
+ 	@(for v in $(ALL_COMMANDS); \
  	do \
  		case "$$v" in \
  		git-merge-octopus | git-merge-ours | git-merge-recursive | \
@@@ -2828,35 -2832,13 +2833,13 @@@
  		sed -e '/^#/d' \
  		    -e 's/[ 	].*//' \
  		    -e 's/^/listed /' command-list.txt; \
- 		ls -1 Documentation/git*txt | \
+ 		$(MAKE) -C Documentation print-man1 | \
+ 		grep '\.txt$$' | \
  		sed -e 's|Documentation/|documented |' \
  		    -e 's/\.txt//'; \
  	) | while read how cmd; \
  	do \
- 		case "$$how,$$cmd" in \
- 		*,git-citool | \
- 		*,git-gui | \
- 		*,git-help | \
- 		documented,gitattributes | \
- 		documented,gitignore | \
- 		documented,gitmodules | \
- 		documented,gitcli | \
- 		documented,git-tools | \
- 		documented,gitcore-tutorial | \
- 		documented,gitcvs-migration | \
- 		documented,gitdiffcore | \
- 		documented,gitglossary | \
- 		documented,githooks | \
- 		documented,gitrepository-layout | \
- 		documented,gitrevisions | \
- 		documented,gittutorial | \
- 		documented,gittutorial-2 | \
- 		documented,git-bisect-lk2009 | \
- 		documented,git-remote-helpers | \
- 		documented,gitworkflows | \
- 		sentinel,not,matching,is,ok ) continue ;; \
- 		esac; \
- 		case " $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git gitk " in \
+ 		case " $(ALL_COMMANDS) " in \
  		*" $$cmd "*)	;; \
  		*) echo "removed but $$how: $$cmd" ;; \
  		esac; \