Changes 1.8.4.2:

* "git clone" gave some progress messages to the standard output, not
  to the standard error, and did not allow suppressing them with the
  "--no-progress" option.
* "format-patch --from=<whom>" forgot to omit unnecessary in-body
  from line, i.e. when <whom> is the same as the real author.
* "git shortlog" used to choke and die when there is a malformed
  commit (e.g. missing authors); it now simply ignore such a commit
  and keeps going.
* "git merge-recursive" did not parse its "--diff-algorithm=" command
  line option correctly.
* "git branch --track" had a minor regression in v1.8.3.2 and later
  that made it impossible to base your local work on anything but a
  local branch of the upstream repository you are tracking from.
* "git ls-files -k" needs to crawl only the part of the working tree
  that may overlap the paths in the index to find killed files, but
  shared code with the logic to find all the untracked files, which
  made it unnecessarily inefficient.
* When there is no sufficient overlap between old and new history
  during a "git fetch" into a shallow repository, objects that the
  sending side knows the receiving end has were unnecessarily sent.
* When running "fetch -q", a long silence while the sender side
  computes the set of objects to send can be mistaken by proxies as
  dropped connection.  The server side has been taught to send a
  small empty messages to keep the connection alive.
* When the webserver responds with "405 Method Not Allowed", "git
  http-backend" should tell the client what methods are allowed with
  the "Allow" header.
* "git cvsserver" computed the permission mode bits incorrectly for
  executable files.
* The implementation of "add -i" has a crippling code to work around
  ActiveState Perl limitation but it by mistake also triggered on Git
  for Windows where MSYS perl is used.
* We made sure that we notice the user-supplied GIT_DIR is actually a
  gitfile, but did not do the same when the default ".git" is a
  gitfile.
* When an object is not found after checking the packfiles and then
  loose object directory, read_sha1_file() re-checks the packfiles to
  prevent racing with a concurrent repacker; teach the same logic to
  has_sha1_file().
* "git commit --author=$name", when $name is not in the canonical
  "A. U. Thor <au.thor@example.xz>" format, looks for a matching name
  from existing history, but did not consult mailmap to grab the
  preferred author name.
* The commit object names in the insn sheet that was prepared at the
  beginning of "rebase -i" session can become ambiguous as the
  rebasing progresses and the repository gains more commits. Make
  sure the internal record is kept with full 40-hex object names.
* "git rebase --preserve-merges" internally used the merge machinery
  and as a side effect, left merge summary message in the log, but
  when rebasing, there should not be a need for merge summary.
* "git rebase -i" forgot that the comment character can be
  configurable while reading its insn sheet.

2 files changed, 6 insertions, 6 deletions

diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index b4b021dc8b7..1a6e073140c 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/10/18 19:48:48 adam Exp $
+$NetBSD: distinfo,v 1.4 2013/11/02 07:54:04 adam Exp $
 
-SHA1 (git-1.8.4.1.tar.gz) = 49004a8dfcbb7c0848147737d9877fd7313a42ec
-RMD160 (git-1.8.4.1.tar.gz) = 0e6c0a3157cfaac312fa2d955d56def510044bae
-Size (git-1.8.4.1.tar.gz) = 4669033 bytes
+SHA1 (git-1.8.4.2.tar.gz) = f2e9317703553b4215700605c15d0f3a30623a9d
+RMD160 (git-1.8.4.2.tar.gz) = da733d1dd0c6b7257419ad83d2d7f37bfcf29d2a
+Size (git-1.8.4.2.tar.gz) = 4672536 bytes
 SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 4ec54b2cfa7..77c6943912e 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.2 2013/10/18 19:48:48 adam Exp $
+# $NetBSD: Makefile.version,v 1.3 2013/11/02 07:54:04 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.8.4.1
+GIT_VERSION=	1.8.4.2