From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Sep 2012 04:20:40 +0000 (-0700)
Subject: Sync with 1.7.11.7
X-Git-Tag: v1.7.12.1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c336bc104c47cc9c2f7caf6bce468fe00a8f6850?ds=inline;hp=-c

Sync with 1.7.11.7
---

c336bc104c47cc9c2f7caf6bce468fe00a8f6850
diff --combined .gitignore
index bb5c91e712,f1acd3e777..68fe464090
--- a/.gitignore
+++ b/.gitignore
@@@ -2,9 -2,6 +2,9 @@@
  /GIT-CFLAGS
  /GIT-LDFLAGS
  /GIT-GUI-VARS
 +/GIT-PREFIX
 +/GIT-SCRIPT-DEFINES
 +/GIT-USER-AGENT
  /GIT-VERSION-FILE
  /bin-wrappers/
  /git
@@@ -34,7 -31,6 +34,7 @@@
  /git-commit-tree
  /git-config
  /git-count-objects
 +/git-credential
  /git-credential-cache
  /git-credential-cache--daemon
  /git-credential-store
@@@ -176,6 -172,7 +176,6 @@@
  /gitweb/static/gitweb.js
  /gitweb/static/gitweb.min.*
  /test-chmtime
 -/test-credential
  /test-ctype
  /test-date
  /test-delta
@@@ -189,6 -186,7 +189,7 @@@
  /test-mktemp
  /test-parse-options
  /test-path-utils
+ /test-regex
  /test-revision-walking
  /test-run-command
  /test-sha1
diff --combined Documentation/git.txt
index fab6e77e02,65c37c4544..34d8a1bbdf
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -22,17 -22,18 +22,17 @@@ unusually rich command set that provide
  and full access to internals.
  
  See linkgit:gittutorial[7] to get started, then see
 -link:everyday.html[Everyday Git] for a useful minimum set of commands, and
 -"man git-commandname" for documentation of each command.  CVS users may
 -also want to read linkgit:gitcvs-migration[7].  See
 -the link:user-manual.html[Git User's Manual] for a more in-depth
 -introduction.
 +link:everyday.html[Everyday Git] for a useful minimum set of
 +commands.  The link:user-manual.html[Git User's Manual] has a more
 +in-depth introduction.
  
 -The '<command>' is either a name of a Git command (see below) or an alias
 -as defined in the configuration file (see linkgit:git-config[1]).
 +After you mastered the basic concepts, you can come back to this
 +page to learn what commands git offers.  You can learn more about
 +individual git commands with "git help command".  linkgit:gitcli[7]
 +manual page gives you an overview of the command line command syntax.
  
 -Formatted and hyperlinked version of the latest git
 -documentation can be viewed at
 -`http://www.kernel.org/pub/software/scm/git/docs/`.
 +Formatted and hyperlinked version of the latest git documentation
 +can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
  
  ifdef::stalenotes[]
  [NOTE]
@@@ -43,14 -44,10 +43,15 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.12/git.html[documentation for release 1.7.12]
 +
 +* release notes for
 +  link:RelNotes/1.7.12.txt[1.7.12].
 +
- * link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
+ * link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
  
  * release notes for
+   link:RelNotes/1.7.11.7.txt[1.7.11.7],
    link:RelNotes/1.7.11.6.txt[1.7.11.6],
    link:RelNotes/1.7.11.5.txt[1.7.11.5],
    link:RelNotes/1.7.11.4.txt[1.7.11.4],
@@@ -411,6 -408,24 +412,6 @@@ help ...`
  	linkgit:git-replace[1] for more information.
  
  
 -FURTHER DOCUMENTATION
 ----------------------
 -
 -See the references above to get started using git.  The following is
 -probably more detail than necessary for a first-time user.
 -
 -The link:user-manual.html#git-concepts[git concepts chapter of the
 -user-manual] and linkgit:gitcore-tutorial[7] both provide
 -introductions to the underlying git architecture.
 -
 -See linkgit:gitworkflows[7] for an overview of recommended workflows.
 -
 -See also the link:howto-index.html[howto] documents for some useful
 -examples.
 -
 -The internals are documented in the
 -link:technical/api-index.html[GIT API documentation].
 -
  GIT COMMANDS
  ------------
  
@@@ -830,29 -845,6 +831,29 @@@ The index is also capable of storing mu
  for a given pathname.  These stages are used to hold the various
  unmerged version of a file when a merge is in progress.
  
 +FURTHER DOCUMENTATION
 +---------------------
 +
 +See the references in the "description" section to get started
 +using git.  The following is probably more detail than necessary
 +for a first-time user.
 +
 +The link:user-manual.html#git-concepts[git concepts chapter of the
 +user-manual] and linkgit:gitcore-tutorial[7] both provide
 +introductions to the underlying git architecture.
 +
 +See linkgit:gitworkflows[7] for an overview of recommended workflows.
 +
 +See also the link:howto-index.html[howto] documents for some useful
 +examples.
 +
 +The internals are documented in the
 +link:technical/api-index.html[GIT API documentation].
 +
 +Users migrating from CVS may also want to
 +read linkgit:gitcvs-migration[7].
 +
 +
  Authors
  -------
  Git was started by Linus Torvalds, and is currently maintained by Junio
diff --combined Makefile
index 66e82167eb,13293d33fd..26b697d175
--- a/Makefile
+++ b/Makefile
@@@ -205,6 -205,8 +205,6 @@@ all:
  # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
  # field that counts the on-disk footprint in 512-byte blocks.
  #
 -# Define ASCIIDOC7 if you want to format documentation with AsciiDoc 7
 -#
  # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
  # (not v1.73 or v1.71).
  #
@@@ -296,13 -298,6 +296,13 @@@
  # the diff algorithm.  It gives a nice speedup if your processor has
  # fast unaligned word loads.  Does NOT work on big-endian systems!
  # Enabled by default on x86_64.
 +#
 +# Define GIT_USER_AGENT if you want to change how git identifies itself during
 +# network interactions.  The default is "git/$(GIT_VERSION)".
 +#
 +# Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
 +# (defaults to "man") if you want to have a different default when
 +# "git help" is called without a parameter specifying the format.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -396,9 -391,12 +396,9 @@@ BUILTIN_OBJS 
  BUILT_INS =
  COMPAT_CFLAGS =
  COMPAT_OBJS =
 -XDIFF_H =
  XDIFF_OBJS =
 -VCSSVN_H =
  VCSSVN_OBJS =
 -VCSSVN_TEST_OBJS =
 -MISC_H =
 +GENERATED_H =
  EXTRA_CPPFLAGS =
  LIB_H =
  LIB_OBJS =
@@@ -484,6 -482,7 +484,6 @@@ X 
  PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
  
  TEST_PROGRAMS_NEED_X += test-chmtime
 -TEST_PROGRAMS_NEED_X += test-credential
  TEST_PROGRAMS_NEED_X += test-ctype
  TEST_PROGRAMS_NEED_X += test-date
  TEST_PROGRAMS_NEED_X += test-delta
@@@ -496,6 -495,7 +496,7 @@@ TEST_PROGRAMS_NEED_X += test-mergesor
  TEST_PROGRAMS_NEED_X += test-mktemp
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
+ TEST_PROGRAMS_NEED_X += test-regex
  TEST_PROGRAMS_NEED_X += test-revision-walking
  TEST_PROGRAMS_NEED_X += test-run-command
  TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
@@@ -558,44 -558,51 +559,44 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  VCSSVN_LIB=vcs-svn/lib.a
  
 -XDIFF_H += xdiff/xinclude.h
 -XDIFF_H += xdiff/xmacros.h
 -XDIFF_H += xdiff/xdiff.h
 -XDIFF_H += xdiff/xtypes.h
 -XDIFF_H += xdiff/xutils.h
 -XDIFF_H += xdiff/xprepare.h
 -XDIFF_H += xdiff/xdiffi.h
 -XDIFF_H += xdiff/xemit.h
 -
 -VCSSVN_H += vcs-svn/line_buffer.h
 -VCSSVN_H += vcs-svn/sliding_window.h
 -VCSSVN_H += vcs-svn/repo_tree.h
 -VCSSVN_H += vcs-svn/fast_export.h
 -VCSSVN_H += vcs-svn/svndiff.h
 -VCSSVN_H += vcs-svn/svndump.h
 -
 -MISC_H += bisect.h
 -MISC_H += branch.h
 -MISC_H += bundle.h
 -MISC_H += common-cmds.h
 -MISC_H += fetch-pack.h
 -MISC_H += reachable.h
 -MISC_H += send-pack.h
 -MISC_H += shortlog.h
 -MISC_H += tar.h
 -MISC_H += thread-utils.h
 -MISC_H += url.h
 -MISC_H += walker.h
 -MISC_H += wt-status.h
 +LIB_H += xdiff/xinclude.h
 +LIB_H += xdiff/xmacros.h
 +LIB_H += xdiff/xdiff.h
 +LIB_H += xdiff/xtypes.h
 +LIB_H += xdiff/xutils.h
 +LIB_H += xdiff/xprepare.h
 +LIB_H += xdiff/xdiffi.h
 +LIB_H += xdiff/xemit.h
 +
 +LIB_H += vcs-svn/line_buffer.h
 +LIB_H += vcs-svn/sliding_window.h
 +LIB_H += vcs-svn/repo_tree.h
 +LIB_H += vcs-svn/fast_export.h
 +LIB_H += vcs-svn/svndiff.h
 +LIB_H += vcs-svn/svndump.h
 +
 +GENERATED_H += common-cmds.h
  
  LIB_H += advice.h
  LIB_H += archive.h
  LIB_H += argv-array.h
  LIB_H += attr.h
 +LIB_H += bisect.h
  LIB_H += blob.h
 +LIB_H += branch.h
  LIB_H += builtin.h
  LIB_H += bulk-checkin.h
 -LIB_H += cache.h
 +LIB_H += bundle.h
  LIB_H += cache-tree.h
 +LIB_H += cache.h
  LIB_H += color.h
 +LIB_H += column.h
  LIB_H += commit.h
  LIB_H += compat/bswap.h
  LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += compat/obstack.h
 +LIB_H += compat/precompose_utf8.h
  LIB_H += compat/terminal.h
  LIB_H += compat/win32/dirent.h
  LIB_H += compat/win32/poll.h
@@@ -611,7 -618,6 +612,7 @@@ LIB_H += diff.
  LIB_H += diffcore.h
  LIB_H += dir.h
  LIB_H += exec_cmd.h
 +LIB_H += fetch-pack.h
  LIB_H += fmt-merge-msg.h
  LIB_H += fsck.h
  LIB_H += gettext.h
@@@ -621,7 -627,6 +622,7 @@@ LIB_H += graph.
  LIB_H += grep.h
  LIB_H += hash.h
  LIB_H += help.h
 +LIB_H += http.h
  LIB_H += kwset.h
  LIB_H += levenshtein.h
  LIB_H += list-objects.h
@@@ -631,20 -636,19 +632,20 @@@ LIB_H += mailmap.
  LIB_H += merge-file.h
  LIB_H += merge-recursive.h
  LIB_H += mergesort.h
 -LIB_H += notes.h
  LIB_H += notes-cache.h
  LIB_H += notes-merge.h
 +LIB_H += notes.h
  LIB_H += object.h
 -LIB_H += pack.h
  LIB_H += pack-refs.h
  LIB_H += pack-revindex.h
 +LIB_H += pack.h
  LIB_H += parse-options.h
  LIB_H += patch-ids.h
  LIB_H += pkt-line.h
  LIB_H += progress.h
  LIB_H += prompt.h
  LIB_H += quote.h
 +LIB_H += reachable.h
  LIB_H += reflog-walk.h
  LIB_H += refs.h
  LIB_H += remote.h
@@@ -652,11 -656,9 +653,11 @@@ LIB_H += rerere.
  LIB_H += resolve-undo.h
  LIB_H += revision.h
  LIB_H += run-command.h
 +LIB_H += send-pack.h
  LIB_H += sequencer.h
  LIB_H += sha1-array.h
  LIB_H += sha1-lookup.h
 +LIB_H += shortlog.h
  LIB_H += sideband.h
  LIB_H += sigchain.h
  LIB_H += strbuf.h
@@@ -664,18 -666,14 +665,18 @@@ LIB_H += streaming.
  LIB_H += string-list.h
  LIB_H += submodule.h
  LIB_H += tag.h
 +LIB_H += tar.h
  LIB_H += thread-utils.h
  LIB_H += transport.h
 -LIB_H += tree.h
  LIB_H += tree-walk.h
 +LIB_H += tree.h
  LIB_H += unpack-trees.h
 +LIB_H += url.h
  LIB_H += userdiff.h
  LIB_H += utf8.h
  LIB_H += varint.h
 +LIB_H += walker.h
 +LIB_H += wt-status.h
  LIB_H += xdiff-interface.h
  LIB_H += xdiff/xdiff.h
  
@@@ -804,7 -802,6 +805,7 @@@ LIB_OBJS += usage.
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
  LIB_OBJS += varint.o
 +LIB_OBJS += version.o
  LIB_OBJS += walker.o
  LIB_OBJS += wrapper.o
  LIB_OBJS += write_or_die.o
@@@ -833,7 -830,6 +834,7 @@@ BUILTIN_OBJS += builtin/commit-tree.
  BUILTIN_OBJS += builtin/commit.o
  BUILTIN_OBJS += builtin/config.o
  BUILTIN_OBJS += builtin/count-objects.o
 +BUILTIN_OBJS += builtin/credential.o
  BUILTIN_OBJS += builtin/describe.o
  BUILTIN_OBJS += builtin/diff-files.o
  BUILTIN_OBJS += builtin/diff-index.o
@@@ -911,8 -907,6 +912,8 @@@ BUILTIN_OBJS += builtin/write-tree.
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  EXTLIBS =
  
 +GIT_USER_AGENT = git/$(GIT_VERSION)
 +
  #
  # Platform specific tweaks
  #
@@@ -999,8 -993,6 +1000,8 @@@ ifeq ($(uname_S),Darwin
  	NO_MEMMEM = YesPlease
  	USE_ST_TIMESPEC = YesPlease
  	HAVE_DEV_TTY = YesPlease
 +	COMPAT_OBJS += compat/precompose_utf8.o
 +	BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -1249,7 -1241,6 +1250,7 @@@ ifeq ($(uname_S),Windows
  	BLK_SHA1 = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	NATIVE_CRLF = YesPlease
 +	DEFAULT_HELP_FORMAT = html
  
  	CC = compat/vcbuild/scripts/clink.pl
  	AR = compat/vcbuild/scripts/lib.pl
@@@ -1852,6 -1843,10 +1853,6 @@@ ifndef 
  endif
  endif
  
 -ifdef ASCIIDOC7
 -	export ASCIIDOC7
 -endif
 -
  ifdef NO_INSTALL_HARDLINKS
  	export NO_INSTALL_HARDLINKS
  endif
@@@ -1929,18 -1924,6 +1930,18 @@@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHE
  BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
  endif
  
 +GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT))
 +GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))"
 +GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ))
 +GIT-USER-AGENT: FORCE
 +	@if test x'$(GIT_USER_AGENT_SQ)' != x"`cat GIT-USER-AGENT 2>/dev/null`"; then \
 +		echo '$(GIT_USER_AGENT_SQ)' >GIT-USER-AGENT; \
 +	fi
 +
 +ifdef DEFAULT_HELP_FORMAT
 +BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
 +endif
 +
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)
  
@@@ -1987,41 -1970,8 +1988,41 @@@ shell_compatibility_test: please_set_SH
  strip: $(PROGRAMS) git$X
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
 -git.o: common-cmds.h
 -git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
 +### Target-specific flags and dependencies
 +
 +# The generic compilation pattern rule and automatically
 +# computed header dependencies (falling back to a dependency on
 +# LIB_H) are enough to describe how most targets should be built,
 +# but some targets are special enough to need something a little
 +# different.
 +#
 +# - When a source file "foo.c" #includes a generated header file,
 +#   we need to list that dependency for the "foo.o" target.
 +#
 +#   We also list it from other targets that are built from foo.c
 +#   like "foo.sp" and "foo.s", even though that is easy to forget
 +#   to do because the generated header is already present around
 +#   after a regular build attempt.
 +#
 +# - Some code depends on configuration kept in makefile
 +#   variables. The target-specific variable EXTRA_CPPFLAGS can
 +#   be used to convey that information to the C preprocessor
 +#   using -D options.
 +#
 +#   The "foo.o" target should have a corresponding dependency on
 +#   a file that changes when the value of the makefile variable
 +#   changes.  For example, targets making use of the
 +#   $(GIT_VERSION) variable depend on GIT-VERSION-FILE.
 +#
 +#   Technically the ".sp" and ".s" targets do not need this
 +#   dependency because they are force-built, but they get the
 +#   same dependency for consistency. This way, you do not have to
 +#   know how each target is implemented. And it means the
 +#   dependencies here will not need to change if the force-build
 +#   details change some day.
 +
 +git.sp git.s git.o: GIT-PREFIX
 +git.sp git.s git.o: EXTRA_CPPFLAGS = \
  	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
  	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
  	'-DGIT_INFO_PATH="$(infodir_SQ)"'
@@@ -2030,19 -1980,14 +2031,19 @@@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
 -help.sp help.o: common-cmds.h
 +help.sp help.s help.o: common-cmds.h
  
 -builtin/help.sp builtin/help.o: common-cmds.h
 +builtin/help.sp builtin/help.s builtin/help.o: common-cmds.h GIT-PREFIX
  builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
  	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
  	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
  	'-DGIT_INFO_PATH="$(infodir_SQ)"'
  
 +version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
 +version.sp version.s version.o: EXTRA_CPPFLAGS = \
 +	'-DGIT_VERSION="$(GIT_VERSION)"' \
 +	'-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)'
 +
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
  	ln git$X $@ 2>/dev/null || \
@@@ -2054,54 -1999,35 +2055,54 @@@ common-cmds.h: ./generate-cmdlist.sh co
  common-cmds.h: $(wildcard Documentation/git-*.txt)
  	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
  
 +SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
 +	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
 +	$(gitwebdir_SQ):$(PERL_PATH_SQ)
  define cmd_munge_script
  $(RM) $@ $@+ && \
  sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
      -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
      -e 's|@@DIFF@@|$(DIFF_SQ)|' \
 -    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
      -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
      -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
      -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
      -e $(BROKEN_PATH_FIX) \
 +    -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
 +    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
      $@.sh >$@+
  endef
  
 -$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +GIT-SCRIPT-DEFINES: FORCE
 +	@FLAGS='$(SCRIPT_DEFINES)'; \
 +	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
 +		echo 1>&2 "    * new script parameters"; \
 +		echo "$$FLAGS" >$@; \
 +            fi
 +
 +
 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh GIT-SCRIPT-DEFINES
  	$(QUIET_GEN)$(cmd_munge_script) && \
  	chmod +x $@+ && \
  	mv $@+ $@
  
 -$(SCRIPT_LIB) : % : %.sh
 +$(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
  	$(QUIET_GEN)$(cmd_munge_script) && \
  	mv $@+ $@
  
  ifndef NO_PERL
  $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
  
 -perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
 +perl/perl.mak: perl/PM.stamp
 +
 +perl/PM.stamp: FORCE
 +	$(QUIET_GEN)$(FIND) perl -type f -name '*.pm' | sort >$@+ && \
 +	{ cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \
 +	$(RM) $@+
 +
 +perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
  
 -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 +$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
  	sed -e '1{' \
@@@ -2121,8 -2047,14 +2122,8 @@@
  gitweb:
  	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
  
 -git-instaweb: git-instaweb.sh gitweb
 -	$(QUIET_GEN)$(RM) $@ $@+ && \
 -	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 -	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 -	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 -	    -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
 -	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
 -	    $@.sh > $@+ && \
 +git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES
 +	$(QUIET_GEN)$(cmd_munge_script) && \
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
@@@ -2136,7 -2068,7 +2137,7 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git
  endif # NO_PERL
  
  ifndef NO_PYTHON
 -$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
 +$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX
  $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
@@@ -2158,23 -2090,24 +2159,23 @@@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % 
  	mv $@+ $@
  endif # NO_PYTHON
  
 -configure: configure.ac
 +configure: configure.ac GIT-VERSION-FILE
  	$(QUIET_GEN)$(RM) $@ $<+ && \
  	sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    $< > $<+ && \
  	autoconf -o $@ $<+ && \
  	$(RM) $<+
  
 -# These can record GIT_VERSION
 -git.o git.spec http.o \
 -	$(patsubst %.sh,%,$(SCRIPT_SH)) \
 -	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
 -	: GIT-VERSION-FILE
 -
 -TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
 -GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
 -	git.o
 -ifndef NO_CURL
 -	GIT_OBJS += http.o http-walker.o remote-curl.o
 +ifdef AUTOCONFIGURED
 +config.status: configure
 +	$(QUIET_GEN)if test -f config.status; then \
 +	  ./config.status --recheck; \
 +	else \
 +	  ./configure; \
 +	fi
 +reconfigure config.mak.autogen: config.status
 +	$(QUIET_GEN)./config.status
 +.PHONY: reconfigure # This is a convenience target.
  endif
  
  XDIFF_OBJS += xdiff/xdiffi.o
@@@ -2192,14 -2125,9 +2193,14 @@@ VCSSVN_OBJS += vcs-svn/fast_export.
  VCSSVN_OBJS += vcs-svn/svndiff.o
  VCSSVN_OBJS += vcs-svn/svndump.o
  
 -VCSSVN_TEST_OBJS += test-line-buffer.o
 -
 -OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
 +TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
 +OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
 +	$(XDIFF_OBJS) \
 +	$(VCSSVN_OBJS) \
 +	git.o
 +ifndef NO_CURL
 +	OBJECTS += http.o http-walker.o remote-curl.o
 +endif
  
  dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
  dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@@ -2298,32 -2226,51 +2299,32 @@@ els
  # Dependencies on automatically generated headers such as common-cmds.h
  # should _not_ be included here, since they are necessary even when
  # building an object for the first time.
 -#
 -# XXX. Please check occasionally that these include all dependencies
 -# gcc detects!
 -
 -$(GIT_OBJS): $(LIB_H)
 -builtin/branch.o builtin/checkout.o builtin/clone.o builtin/reset.o branch.o transport.o: branch.h
 -builtin/bundle.o bundle.o transport.o: bundle.h
 -builtin/bisect--helper.o builtin/rev-list.o bisect.o: bisect.h
 -builtin/clone.o builtin/fetch-pack.o transport.o: fetch-pack.h
 -builtin/index-pack.o builtin/grep.o builtin/pack-objects.o transport-helper.o thread-utils.o: thread-utils.h
 -builtin/send-pack.o transport.o: send-pack.h
 -builtin/log.o builtin/shortlog.o: shortlog.h
 -builtin/prune.o builtin/reflog.o reachable.o: reachable.h
 -builtin/commit.o builtin/revert.o wt-status.o: wt-status.h
 -builtin/tar-tree.o archive-tar.o: tar.h
 -connect.o transport.o url.o http-backend.o: url.h
 -builtin/branch.o builtin/commit.o builtin/tag.o column.o help.o pager.o: column.h
 -http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
 -http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
 -
 -xdiff-interface.o $(XDIFF_OBJS): $(XDIFF_H)
  
 -$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) $(VCSSVN_H)
 +$(OBJECTS): $(LIB_H)
  endif
  
 +exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX
  exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
  	'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
  	'-DBINDIR="$(bindir_relative_SQ)"' \
  	'-DPREFIX="$(prefix_SQ)"'
  
 +builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX
  builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \
  	-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
  
 +config.sp config.s config.o: GIT-PREFIX
  config.sp config.s config.o: EXTRA_CPPFLAGS = \
  	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
 +attr.sp attr.s attr.o: GIT-PREFIX
  attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
  	-DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"'
  
 +gettext.sp gettext.s gettext.o: GIT-PREFIX
  gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
  	-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
  
 -http.sp http.s http.o: EXTRA_CPPFLAGS = \
 -	-DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
 -
  ifdef NO_EXPAT
  http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
@@@ -2395,10 -2342,9 +2396,10 @@@ XGETTEXT_FLAGS = 
  	--from-code=UTF-8
  XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
  	--keyword=_ --keyword=N_ --keyword="Q_:1,2"
 -XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell
 +XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
 +	--keyword=gettextln --keyword=eval_gettextln
  XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
 -LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(XDIFF_H) $(VCSSVN_H) $(MISC_H)
 +LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
  LOCALIZED_SH := $(SCRIPT_SH)
  LOCALIZED_PERL := $(SCRIPT_PERL)
  
@@@ -2445,22 -2391,14 +2446,22 @@@ cscope
  	$(FIND_SOURCE_FILES) | xargs cscope -b
  
  ### Detect prefix changes
 -TRACK_CFLAGS = $(CC):$(subst ','\'',$(ALL_CFLAGS)):\
 -             $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
 -             $(localedir_SQ):$(USE_GETTEXT_SCHEME)
 +TRACK_PREFIX = $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
 +		$(localedir_SQ)
 +
 +GIT-PREFIX: FORCE
 +	@FLAGS='$(TRACK_PREFIX)'; \
 +	if test x"$$FLAGS" != x"`cat GIT-PREFIX 2>/dev/null`" ; then \
 +		echo 1>&2 "    * new prefix flags"; \
 +		echo "$$FLAGS" >GIT-PREFIX; \
 +	fi
 +
 +TRACK_CFLAGS = $(CC):$(subst ','\'',$(ALL_CFLAGS)):$(USE_GETTEXT_SCHEME)
  
  GIT-CFLAGS: FORCE
  	@FLAGS='$(TRACK_CFLAGS)'; \
  	    if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
 -		echo 1>&2 "    * new build flags or prefix"; \
 +		echo 1>&2 "    * new build flags"; \
  		echo "$$FLAGS" >GIT-CFLAGS; \
              fi
  
@@@ -2712,7 -2650,7 +2713,7 @@@ quick-install-html
  
  ### Maintainer's dist rules
  
 -git.spec: git.spec.in
 +git.spec: git.spec.in GIT-VERSION-FILE
  	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
  	mv $@+ $@
  
@@@ -2762,9 -2700,6 +2763,9 @@@ dist-doc
  
  distclean: clean
  	$(RM) configure
 +	$(RM) config.log config.status config.cache
 +	$(RM) config.mak.autogen config.mak.append
 +	$(RM) -r autom4te.cache
  
  profile-clean:
  	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
@@@ -2779,6 -2714,8 +2780,6 @@@ clean: profile-clea
  	$(RM) -r $(dep_dirs)
  	$(RM) -r po/build/
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
 -	$(RM) -r autom4te.cache
 -	$(RM) config.log config.mak.autogen config.mak.append config.status config.cache
  	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
  	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
@@@ -2797,7 -2734,6 +2798,7 @@@ ifndef NO_TCLT
  	$(MAKE) -C git-gui clean
  endif
  	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
 +	$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES
  
  .PHONY: all install profile-clean clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
@@@ -2805,13 -2741,8 +2806,13 @@@
  
  ### 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 | \
@@@ -2833,13 -2764,35 +2834,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; \
diff --combined builtin/log.c
index ecc2793690,a8249d3c01..c22469cab6
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -21,7 -21,6 +21,7 @@@
  #include "parse-options.h"
  #include "branch.h"
  #include "streaming.h"
 +#include "version.h"
  
  /* Set a default date-time format for git log ("log.date" config variable) */
  static const char *default_date_mode = NULL;
@@@ -109,9 -108,9 +109,9 @@@ static void cmd_log_init_finish(int arg
  			     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
  			     PARSE_OPT_KEEP_DASHDASH);
  
- 	argc = setup_revisions(argc, argv, rev, opt);
  	if (quiet)
  		rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
+ 	argc = setup_revisions(argc, argv, rev, opt);
  
  	/* Any arguments at this point are not recognized */
  	if (argc > 1)
@@@ -367,7 -366,6 +367,7 @@@ int cmd_whatchanged(int argc, const cha
  	rev.simplify_history = 0;
  	memset(&opt, 0, sizeof(opt));
  	opt.def = "HEAD";
 +	opt.revarg_opt = REVARG_COMMITTISH;
  	cmd_log_init(argc, argv, prefix, &rev, &opt);
  	if (!rev.diffopt.output_format)
  		rev.diffopt.output_format = DIFF_FORMAT_RAW;
@@@ -558,7 -556,6 +558,7 @@@ int cmd_log(int argc, const char **argv
  	rev.always_show_header = 1;
  	memset(&opt, 0, sizeof(opt));
  	opt.def = "HEAD";
 +	opt.revarg_opt = REVARG_COMMITTISH;
  	cmd_log_init(argc, argv, prefix, &rev, &opt);
  	return cmd_log_walk(&rev);
  }
@@@ -1134,7 -1131,6 +1134,7 @@@ int cmd_format_patch(int argc, const ch
  	rev.subject_prefix = fmt_patch_subject_prefix;
  	memset(&s_r_opt, 0, sizeof(s_r_opt));
  	s_r_opt.def = "HEAD";
 +	s_r_opt.revarg_opt = REVARG_COMMITTISH;
  
  	if (default_attach) {
  		rev.mime_boundary = default_attach;