Changes 2.6.2:

 * There were some classes of errors that "git fsck" diagnosed to its
   standard error that did not cause it to exit with non-zero status.

 * A test script for the HTTP service had a timing dependent bug,
   which was fixed.

 * Performance-measurement tests did not work without an installed Git.

 * On a case insensitive filesystems, setting GIT_WORK_TREE variable
   using a random cases that does not agree with what the filesystem
   thinks confused Git that it wasn't inside the working tree.

 * When "git am" was rewritten as a built-in, it stopped paying
   attention to user.signingkey, which was fixed.

 * After "git checkout --detach", "git status" reported a fairly
   useless "HEAD detached at HEAD", instead of saying at which exact
   commit.

 * "git rebase -i" had a minor regression recently, which stopped
   considering a line that begins with an indented '#' in its insn
   sheet not a comment, which is now fixed.

 * Description of the "log.follow" configuration variable in "git log"
   documentation is now also copied to "git config" documentation.

 * Allocation related functions and stdio are unsafe things to call
   inside a signal handler, and indeed killing the pager can cause
   glibc to deadlock waiting on allocation mutex as our signal handler
   tries to free() some data structures in wait_for_pager().  Reduce
   these unsafe calls.

 * The way how --ref/--notes to specify the notes tree reference are
   DWIMmed was not clearly documented.

 * Customization to change the behaviour with "make -w" and "make -s"
   in our Makefile was broken when they were used together.

 * The Makefile always runs the library archiver with hardcoded "crs"
   options, which was inconvenient for exotic platforms on which
   people want to use programs with totally different set of command
   line options.

 * The ssh transport, just like any other transport over the network,
   did not clear GIT_* environment variables, but it is possible to
   use SendEnv and AcceptEnv to leak them to the remote invocation of
   Git, which is not a good idea at all.  Explicitly clear them just
   like we do for the local transport.

 * "git blame --first-parent v1.0..v2.0" was not rejected but did not
   limit the blame to commits on the first parent chain.

 * Very small number of options take a parameter that is optional
   (which is not a great UI element as they can only appear at the end
   of the command line).  Add notice to documentation of each and
   every one of them.

Also contains typofixes, documentation updates and trivial code
clean-ups.

3 files changed, 17 insertions, 16 deletions

diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index c94015a7166..204327ebb1f 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.36 2015/10/07 14:08:41 ryoon Exp $
+$NetBSD: distinfo,v 1.37 2015/10/17 07:44:56 adam Exp $
 
-SHA1 (git-2.6.1.tar.xz) = ec6608e91e8969d58e5755b998fa9d73da44675d
-RMD160 (git-2.6.1.tar.xz) = d6a2d93f814264339f314a0b46a0ba22d43b6e9d
-Size (git-2.6.1.tar.xz) = 3811268 bytes
-SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2
+SHA1 (git-2.6.2.tar.xz) = 5ff563d0589cc6e62a670c6546c1edcff81dda9a
+RMD160 (git-2.6.2.tar.xz) = 40f170344a5c0d5087dfe73ae1e0eac2e4a65939
+SHA512 (git-2.6.2.tar.xz) = b112c792442d2d6905c6d9ac4598b7f7ae7caf12ab353b2dc6cc7e72a162dd7225cd4cfd8cb4abb29ddddc68b0473e6f872a08240ab6e0a43c92e6c4cf63289e
+Size (git-2.6.2.tar.xz) = 3812636 bytes
+SHA1 (patch-aa) = 892e2dc9336a794399046ac2b4c59f3650d458f8
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
diff --git a/devel/git-base/patches/patch-aa b/devel/git-base/patches/patch-aa
index 573becba810..880cc23e604 100644
--- a/devel/git-base/patches/patch-aa
+++ b/devel/git-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
+$NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
 
---- Makefile.orig	2014-05-30 21:38:10.000000000 +0000
+--- Makefile.orig	2015-10-16 21:58:26.000000000 +0000
 +++ Makefile
-@@ -354,8 +354,6 @@ GIT-VERSION-FILE: FORCE
+@@ -371,8 +371,6 @@ GIT-VERSION-FILE: FORCE
  
  CFLAGS = -g -O2 -Wall
  LDFLAGS =
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
 -ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
  
- # Among the variables below, these:
-@@ -396,13 +394,9 @@ htmldir_relative = $(patsubst $(prefix)/
+ # Create as necessary, replace existing, make ranlib unneeded.
+@@ -416,13 +414,9 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1635,8 +1629,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -1586,8 +1580,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
@@ -36,10 +36,10 @@ $NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2349,11 +2343,10 @@ install: all
+@@ -2278,11 +2272,10 @@ install: all
  ifndef NO_GETTEXT
-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
-	(cd po/build/locale && $(TAR) cf - .) | \
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
+ 	(cd po/build/locale && $(TAR) cf - .) | \
 -	(cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
 +	(cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
  endif
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 782f2fa5d58..3d741b42a9e 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.32 2015/10/07 14:08:41 ryoon Exp $
+# $NetBSD: Makefile.version,v 1.33 2015/10/17 07:44:56 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.6.1
+GIT_VERSION=	2.6.2