Changes 2.7.3:

* Traditionally, the tests that try commands that work on the
  contents in the working tree were named with "worktree" in their
  filenames, but with the recent addition of "git worktree"
  subcommand, whose tests are also named similarly, it has become
  harder to tell them apart.  The traditional tests have been renamed
  to use "work-tree" instead in an attempt to differentiate them.

* Many codepaths forget to check return value from git_config_set();
  the function is made to die() to make sure we do not proceed when
  setting a configuration variable failed.

* Handling of errors while writing into our internal asynchronous
  process has been made more robust, which reduces flakiness in our
  tests.

* "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
  rev, i.e. the object named by the the pathname with wildcard
  characters in a tree object.

* "git rev-parse --git-common-dir" used in the worktree feature
  misbehaved when run from a subdirectory.

* The "v(iew)" subcommand of the interactive "git am -i" command was
  broken in 2.6.0 timeframe when the command was rewritten in C.

* "git merge-tree" used to mishandle "both sides added" conflict with
  its own "create a fake ancestor file that has the common parts of
  what both sides have added and do a 3-way merge" logic; this has
  been updated to use the usual "3-way merge with an empty blob as
  the fake common ancestor file" approach used in the rest of the
  system.

* The memory ownership rule of fill_textconv() API, which was a bit
  tricky, has been documented a bit better.

* The documentation did not clearly state that the 'simple' mode is
  now the default for "git push" when push.default configuration is
  not set.

* Recent versions of GNU grep are pickier when their input contains
  arbitrary binary data, which some of our tests uses.  Rewrite the
  tests to sidestep the problem.

* A helper function "git submodule" uses since v2.7.0 to list the
  modules that match the pathspec argument given to its subcommands
  (e.g. "submodule add <repo> <path>") has been fixed.

* "git config section.var value" to set a value in per-repository
  configuration file failed when it was run outside any repository,
  but didn't say the reason correctly.

* The code to read the pack data using the offsets stored in the pack
  idx file has been made more carefully check the validity of the
  data in the idx.

3 files changed, 8 insertions, 9 deletions

diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index b897ffbe435..3c87beb40bd 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.21 2016/03/05 11:28:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2016/03/12 11:33:32 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=	git-base-${GIT_VERSION}
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 867f085e4f2..3eccff1bd42 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2016/02/29 10:50:55 adam Exp $
+$NetBSD: distinfo,v 1.45 2016/03/12 11:33:32 adam Exp $
 
-SHA1 (git-2.7.2.tar.xz) = 2126585d365545998da424e3ddb16096674f4aae
-RMD160 (git-2.7.2.tar.xz) = 032624ca6fe26b29b3ba85644cec0bb866bb3e67
-SHA512 (git-2.7.2.tar.xz) = fa139b10d134742efa74707ca77111463656000fd3fae52752eb5af1e56b57d9a2a6d21e6c23085af8db830b811387435fe95c1310b28ef280630e99e432fc79
-Size (git-2.7.2.tar.xz) = 3907296 bytes
+SHA1 (git-2.7.3.tar.xz) = d7be9af73cc56c606e0744beb0091b612b416909
+RMD160 (git-2.7.3.tar.xz) = 5111811158362bbc6d4e0a97ec8df8e56c1bd674
+SHA512 (git-2.7.3.tar.xz) = f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72
+Size (git-2.7.3.tar.xz) = 3909636 bytes
 SHA1 (patch-aa) = 892e2dc9336a794399046ac2b4c59f3650d458f8
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 74d2a0b0e21..cf8587197b9 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.38 2016/02/29 10:50:55 adam Exp $
+# $NetBSD: Makefile.version,v 1.39 2016/03/12 11:33:32 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.7.2
+GIT_VERSION=	2.7.3