From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jun 2015 19:45:18 +0000 (-0700)
Subject: Merge branch 'sg/help-group'
X-Git-Tag: v2.5.0-rc0~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6dec263333417738528089834bd8cda72017aa31?hp=-c

Merge branch 'sg/help-group'

Group list of commands shown by "git help" along the workflow
elements to help early learners.

* sg/help-group:
help: respect new common command grouping
command-list.txt: drop the "common" tag
generate-cmdlist: parse common group commands
command-list.txt: add the common groups block
command-list: prepare machinery for upcoming "common groups" section
---

6dec263333417738528089834bd8cda72017aa31
diff --combined Makefile
index 323c401e96,f088b46c86..54ec511dff
--- a/Makefile
+++ b/Makefile
@@@ -359,8 -359,6 +359,8 @@@ all:
  # compiler is detected to support it.
  #
  # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
 +#
 +# Define HAVE_GETDELIM if your system has the getdelim() function.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -574,7 -572,6 +574,7 @@@ TEST_PROGRAMS_NEED_X += test-dat
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
  TEST_PROGRAMS_NEED_X += test-dump-split-index
 +TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
  TEST_PROGRAMS_NEED_X += test-genrandom
  TEST_PROGRAMS_NEED_X += test-hashmap
  TEST_PROGRAMS_NEED_X += test-index-version
@@@ -1440,10 -1437,6 +1440,10 @@@ ifdef HAVE_BSD_SYSCT
  	BASIC_CFLAGS += -DHAVE_BSD_SYSCTL
  endif
  
 +ifdef HAVE_GETDELIM
 +	BASIC_CFLAGS += -DHAVE_GETDELIM
 +endif
 +
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK = NoThanks
  endif
@@@ -1694,10 -1687,10 +1694,10 @@@ $(BUILT_INS): git$
  	ln -s $< $@ 2>/dev/null || \
  	cp $< $@
  
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
+ common-cmds.h: generate-cmdlist.perl command-list.txt
  
  common-cmds.h: $(wildcard Documentation/git-*.txt)
- 	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
+ 	$(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
  
  SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
  	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
@@@ -2109,7 -2102,6 +2109,7 @@@ GIT-BUILD-OPTIONS: FORC
  	@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
  	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
 +	@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@
  	@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
  	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
@@@ -2455,7 -2447,7 +2455,7 @@@ check-docs:
  		esac ; \
  		test -f "Documentation/$$v.txt" || \
  		echo "no doc: $$v"; \
- 		sed -e '/^#/d' command-list.txt | \
+ 		sed -e '1,/^### command list/d' -e '/^#/d' command-list.txt | \
  		grep -q "^$$v[ 	]" || \
  		case "$$v" in \
  		git) ;; \
@@@ -2463,7 -2455,8 +2463,8 @@@
  		esac ; \
  	done; \
  	( \
- 		sed -e '/^#/d' \
+ 		sed -e '1,/^### command list/d' \
+ 		    -e '/^#/d' \
  		    -e 's/[ 	].*//' \
  		    -e 's/^/listed /' command-list.txt; \
  		$(MAKE) -C Documentation print-man1 | \