CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul 13 06:55:19 UTC 2017

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: distinfo

Log Message:
Git v2.13.3:

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

 * The 'diff-highlight' program (in contrib/) has been restructured
   for easier reuse by an external project 'diff-so-fancy'.

 * "git mergetool" learned to work around a wrapper MacOS X adds
   around underlying meld.

 * An example in documentation that does not work in multi worktree
   configuration has been corrected.

 * The pretty-format specifiers like '%h', '%t', etc. had an
   optimization that no longer works correctly.  In preparation/hope
   of getting it correctly implemented, first discard the optimization
   that is broken.

 * The code to pick up and execute command alias definition from the
   configuration used to switch to the top of the working tree and
   then come back when the expanded alias was executed, which was
   unnecessarilyl complex.  Attempt to simplify the logic by using the
   early-config mechanism that does not chdir around.

 * "git add -p" were updated in 2.12 timeframe to cope with custom
   core.commentchar but the implementation was buggy and a
   metacharacter like $ and * did not work.

 * Fix a recent regression to "git rebase -i" and add tests that would
   have caught it and others.

 * An unaligned 32-bit access in pack-bitmap code ahs been corrected.

 * Tighten error checks for invalid "git apply" input.

 * The split index code did not honor core.sharedrepository setting
   correctly.

 * The Makefile rule in contrib/subtree for building documentation
   learned to honour USE_ASCIIDOCTOR just like the main documentation
   set does.

 * A few tests that tried to verify the contents of push certificates
   did not use 'git rev-parse' to formulate the line to look for in
   the certificate correctly.

 * After "git branch --move" of the currently checked out branch, the
   code to walk the reflog of HEAD via "log -g" and friends
   incorrectly stopped at the reflog entry that records the renaming
   of the branch.

 * The rewrite of "git branch --list" using for-each-ref's internals
   that happened in v2.13 regressed its handling of color.branch.local;
   this has been fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/git-base/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.57 pkgsrc/devel/git/Makefile.version:1.58
--- pkgsrc/devel/git/Makefile.version:1.57      Sun Jun 25 03:15:11 2017
+++ pkgsrc/devel/git/Makefile.version   Thu Jul 13 06:55:19 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.57 2017/06/25 03:15:11 mef Exp $
+# $NetBSD: Makefile.version,v 1.58 2017/07/13 06:55:19 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.13.2
+GIT_VERSION=   2.13.3

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.66 pkgsrc/devel/git-base/distinfo:1.67
--- pkgsrc/devel/git-base/distinfo:1.66 Sun Jun 25 03:15:11 2017
+++ pkgsrc/devel/git-base/distinfo      Thu Jul 13 06:55:19 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2017/06/25 03:15:11 mef Exp $
+$NetBSD: distinfo,v 1.67 2017/07/13 06:55:19 adam Exp $
 
-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 (git-2.13.3.tar.xz) = a3916b3fa5a09ad7e478f4d78265b0ca1916d55d
+RMD160 (git-2.13.3.tar.xz) = c205f6c627baeebac333199ea123c3ed807872d4
+SHA512 (git-2.13.3.tar.xz) = 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b
+Size (git-2.13.3.tar.xz) = 4754532 bytes
 SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca