CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb 20 09:26:56 UTC 2018

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

Log Message:
git: updated to 2.16.2

Git v2.16.2 Release Notes

Fixes since v2.16.1

 * An old regression in "git describe --all $annotated_tag^0" has been
   fixed.

 * "git svn dcommit" did not take into account the fact that a
   svn+ssh:// URL with a username@ (typically used for pushing) refers
   to the same SVN repository without the username@ and failed when
   svn.pushmergeinfo option is set.

 * "git merge -Xours/-Xtheirs" learned to use our/their version when
   resolving a conflicting updates to a symbolic link.

 * "git clone $there $here" is allowed even when here directory exists
   as long as it is an empty directory, but the command incorrectly
   removed it upon a failure of the operation.

 * "git stash -- <pathspec>" incorrectly blew away untracked files in
   the directory that matched the pathspec, which has been corrected.

 * "git add -p" was taught to ignore local changes to submodules as
   they do not interfere with the partial addition of regular changes
   anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.76 -r1.77 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.67 pkgsrc/devel/git/Makefile.version:1.68
--- pkgsrc/devel/git/Makefile.version:1.67      Tue Jan 23 10:28:55 2018
+++ pkgsrc/devel/git/Makefile.version   Tue Feb 20 09:26:56 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.67 2018/01/23 10:28:55 adam Exp $
+# $NetBSD: Makefile.version,v 1.68 2018/02/20 09:26:56 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.16.1
+GIT_VERSION=   2.16.2

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.50 pkgsrc/devel/git-base/Makefile:1.51
--- pkgsrc/devel/git-base/Makefile:1.50 Thu Feb  8 11:28:46 2018
+++ pkgsrc/devel/git-base/Makefile      Tue Feb 20 09:26:56 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2018/02/08 11:28:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2018/02/20 09:26:56 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}
-PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=            scmgit-base-[0-9]*

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.76 pkgsrc/devel/git-base/distinfo:1.77
--- pkgsrc/devel/git-base/distinfo:1.76 Tue Jan 23 10:28:55 2018
+++ pkgsrc/devel/git-base/distinfo      Tue Feb 20 09:26:56 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.76 2018/01/23 10:28:55 adam Exp $
+$NetBSD: distinfo,v 1.77 2018/02/20 09:26:56 adam Exp $
 
-SHA1 (git-2.16.1.tar.xz) = ea5527ea064cd881c427b3316bbaabea225caaf2
-RMD160 (git-2.16.1.tar.xz) = 25ec306da1a322a744a92154bdb3eab24d768836
-SHA512 (git-2.16.1.tar.xz) = 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a
-Size (git-2.16.1.tar.xz) = 4961656 bytes
+SHA1 (git-2.16.2.tar.xz) = 8858cbf822eb3c86df91336fbcbdfe69f9c0abc5
+RMD160 (git-2.16.2.tar.xz) = bfc6cbbf54c0c9ea10952005a91f93db141c88be
+SHA512 (git-2.16.2.tar.xz) = ff1bf4b94c09de26acf85b97003582002c232e5861a896d8c2d8dc011cb3d4966b1eb0e74ef94f80426d50bb465bf6c9b6edda13b1e4143f0eb38ee01f4890e4
+Size (git-2.16.2.tar.xz) = 4963204 bytes
 SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca