[pkgsrc/trunk]: pkgsrc/devel Updated devel/git-{base, contrib, docs, git-gitk} t...

[mef <mef%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a7640b3b00f
branches:  trunk
changeset: 364458:2a7640b3b00f
user:      mef <mef%pkgsrc.org@localhost>
date:      Sun Jun 25 03:15:11 2017 +0000

description:
Updated devel/git-{base,contrib,docs,git-gitk} to 2.13.2
--------------------------------------------------------
Git v2.13.2 Release Notes
=========================

Fixes since v2.13.1
-------------------

 * The "collision detecting" SHA-1 implementation shipped with 2.13.1
   was still broken on some platforms.  Update to the upstream code
   again to take their fix.

 * "git checkout --recurse-submodules" did not quite work with a
   submodule that itself has submodules.

 * Introduce the BUG() macro to improve die("BUG: ...").

 * The "run-command" API implementation has been made more robust
   against dead-locking in a threaded environment.

 * A recent update to t5545-push-options.sh started skipping all the
   tests in the script when a web server testing is disabled or
   unavailable, not just the ones that require a web server.  Non HTTP
   tests have been salvaged to always run in this script.

 * "git clean -d" used to clean directories that has ignored files,
   even though the command should not lose ignored ones without "-x".
   "git status --ignored"  did not list ignored and untracked files
   without "-uall".  These have been corrected.

 * The timestamp of the index file is now taken after the file is
   closed, to help Windows, on which a stale timestamp is reported by
   fstat() on a file that is opened for writing and data was written
   but not yet closed.

 * "git pull --rebase --autostash" didn't auto-stash when the local history
   fast-forwards to the upstream.

 * "git describe --contains" penalized light-weight tags so much that
   they were almost never considered.  Instead, give them about the
   same chance to be considered as an annotated tag that is the same
   age as the underlying commit would.

 * The result from "git diff" that compares two blobs, e.g. "git diff
   $commit1:$path $commit2:$path", used to be shown with the full
   object name as given on the command line, but it is more natural to
   use the $path in the output and use it to look up .gitattributes.

 * A flaky test has been corrected.

 * Help contributors that visit us at GitHub.

 * "git stash push <pathspec>" did not work from a subdirectory at all.
   Bugfix for a topic in v2.13

Also contains various documentation updates and code clean-ups.

(pkgsrc-changes)
----------------
  drop patch git-base/patches/patch-sha1dc_sha1.c, see the first paragraph
  of above RelNote

diffstat:

 devel/git-base/distinfo                    |  11 +++---
 devel/git-base/patches/patch-sha1dc_sha1.c |  47 ------------------------------
 devel/git/Makefile.version                 |   4 +-
 3 files changed, 7 insertions(+), 55 deletions(-)

diffs (88 lines):

diff -r dad7f802e488 -r 2a7640b3b00f devel/git-base/distinfo
--- a/devel/git-base/distinfo   Sun Jun 25 03:09:45 2017 +0000
+++ b/devel/git-base/distinfo   Sun Jun 25 03:15:11 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.65 2017/06/08 09:08:51 wiz Exp $
+$NetBSD: distinfo,v 1.66 2017/06/25 03:15:11 mef Exp $
 
-SHA1 (git-2.13.1.tar.xz) = 2e55f6cc053aa3c19418ac3b8afea6fdd1f970c8
-RMD160 (git-2.13.1.tar.xz) = 34b7124a0773035aa32b51092f9f1aed7662966f
-SHA512 (git-2.13.1.tar.xz) = bc3ed93070ec1768b492009f486a1f82bba838aa94b782c08ad655c89e365a9cd749842e89e7581c5a1246f85da8cb0a5af848b791078203939cf5e5e2ce9acc
-Size (git-2.13.1.tar.xz) = 4746640 bytes
+SHA1 (git-2.13.2.tar.xz) = 2eb5d02274b63be803afec791143deaa4b8ad45a
+RMD160 (git-2.13.2.tar.xz) = a9a2751eb0bcf6d05e734bcb3ef3b67c351e8455
+SHA512 (git-2.13.2.tar.xz) = 07d78ab867179db75738863edf119662b28ea0b15416861cc447d8af1d9d61930873ba5d19205cf3f274aeeedc980acd4c3aceb89633f90c92d84a87216aa1c1
+Size (git-2.13.2.tar.xz) = 4751380 bytes
 SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
@@ -12,5 +12,4 @@
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
-SHA1 (patch-sha1dc_sha1.c) = 600215fa46f3bfcad80bde622a5d25924df1755a
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
diff -r dad7f802e488 -r 2a7640b3b00f devel/git-base/patches/patch-sha1dc_sha1.c
--- a/devel/git-base/patches/patch-sha1dc_sha1.c        Sun Jun 25 03:09:45 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-sha1dc_sha1.c,v 1.4 2017/06/08 09:08:51 wiz Exp $
-
-Fix endianness issue using upstream commit
-https://github.com/git/git/commit/6b851e536b05e0c8c61f77b9e4c3e7cedea39ff8
-
---- sha1dc/sha1.c.orig 2017-06-05 01:08:11.000000000 +0000
-+++ sha1dc/sha1.c
-@@ -35,15 +35,33 @@
- #ifdef SHA1DC_BIGENDIAN
- #undef SHA1DC_BIGENDIAN
- #endif
--#if (!defined SHA1DC_FORCE_LITTLEENDIAN) && \
--    ((defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
--    (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) || \
--    defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) ||  defined(__AARCH64EB__) || \
--    defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) || defined(SHA1DC_FORCE_BIGENDIAN))
- 
-+#if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || defined(__BYTE_ORDER__))
-+
-+#if ((defined(_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
-+     (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
-+     (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) )
- #define SHA1DC_BIGENDIAN
-+#endif
-+
-+#else
-+
-+#if (defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__) || \
-+     defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
-+     defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
-+     defined(__sparc))
-+#define SHA1DC_BIGENDIAN
-+#endif
- 
--#endif /*ENDIANNESS SELECTION*/
-+#endif
-+
-+#if (defined(SHA1DC_FORCE_LITTLEENDIAN) && defined(SHA1DC_BIGENDIAN))
-+#undef SHA1DC_BIGENDIAN
-+#endif
-+#if (defined(SHA1DC_FORCE_BIGENDIAN) && !defined(SHA1DC_BIGENDIAN))
-+#define SHA1DC_BIGENDIAN
-+#endif
-+/*ENDIANNESS SELECTION*/
- 
- #if (defined SHA1DC_FORCE_UNALIGNED_ACCESS || \
-      defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \
diff -r dad7f802e488 -r 2a7640b3b00f devel/git/Makefile.version
--- a/devel/git/Makefile.version        Sun Jun 25 03:09:45 2017 +0000
+++ b/devel/git/Makefile.version        Sun Jun 25 03:15:11 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.56 2017/06/05 10:11:39 adam Exp $
+# $NetBSD: Makefile.version,v 1.57 2017/06/25 03:15:11 mef Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.13.1
+GIT_VERSION=   2.13.2