Fixes since v2.6.3

------------------

 * The "configure" script did not test for -lpthread correctly, which
   upset some linkers.

 * Add support for talking http/https over socks proxy.

 * Portability fix for Windows, which may rewrite $SHELL variable using
   non-POSIX paths.

 * We now consistently allow all hooks to ignore their standard input,
   rather than having git complain of SIGPIPE.

 * Fix shell quoting in contrib script.

 * Test portability fix for a topic in v2.6.1.

 * Allow tilde-expansion in some http config variables.

 * Give a useful special case "diff/show --word-diff-regex=." as an
   example in the documentation.

 * Fix for a corner case in filter-branch.

 * Make git-p4 work on a detached head.

 * Documentation clarification for "check-ignore" without "--verbose".

 * Just like the working tree is cleaned up when the user cancelled
   submission in P4Submit.applyCommit(), clean up the mess if "p4
   submit" fails.

 * Having a leftover .idx file without corresponding .pack file in
   the repository hurts performance; "git gc" learned to prune them.

 * The code to prepare the working tree side of temporary directory
   for the "dir-diff" feature forgot that symbolic links need not be
   copied (or symlinked) to the temporary area, as the code already
   special cases and overwrites them.  Besides, it was wrong to try
   computing the object name of the target of symbolic link, which may
   not even exist or may be a directory.

 * There was no way to defeat a configured rebase.autostash variable
   from the command line, as "git rebase --no-autostash" was missing.

 * Allow "git interpret-trailers" to run outside of a Git repository.

 * Produce correct "dirty" marker for shell prompts, even when we
   are on an orphan or an unborn branch.

 * Some corner cases have been fixed in string-matching done in "git
   status".

 * Apple's common crypto implementation of SHA1_Update() does not take
   more than 4GB at a time, and we now have a compile-time workaround
   for it.

2 files changed, 7 insertions, 7 deletions

diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index d8bf5d860b4..6b1c7c1fe62 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.40 2015/11/06 15:45:05 adam Exp $
+$NetBSD: distinfo,v 1.41 2015/12/10 13:35:46 adam Exp $
 
-SHA1 (git-2.6.3.tar.xz) = eb522811e095c8c972ab5724ab8e964cc13ebc0f
-RMD160 (git-2.6.3.tar.xz) = a786145a4b2f3b25906c312e54a5bfc90040a6a2
-SHA512 (git-2.6.3.tar.xz) = c388235806c5cc67e6ee4ba56225b91f27c09305cbc4f988199a45897c0bf065b9e44f18bd671bb0483133598e5bfa08382742caaca8a77ca117b039bf59d024
-Size (git-2.6.3.tar.xz) = 3819080 bytes
+SHA1 (git-2.6.4.tar.xz) = aa38f1a026add0d840049abd0040ad2938c113e8
+RMD160 (git-2.6.4.tar.xz) = 0064d711eb4cac1b7c15b62f9f83bf3bed88ef16
+SHA512 (git-2.6.4.tar.xz) = 935233c6dc504448af5dce3115174f9d36489288f7f16790f21dd0faa2699ed71609b8053182e0e2b100b9229cde80ca4d944ecc7723e697bec7af5b28b8f12e
+Size (git-2.6.4.tar.xz) = 3820804 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 8b81a15eb5a..a1e4fbab2ff 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.34 2015/11/06 15:45:05 adam Exp $
+# $NetBSD: Makefile.version,v 1.35 2015/12/10 13:35:46 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.6.3
+GIT_VERSION=	2.6.4