[pkgsrc/trunk]: pkgsrc/devel git: updated to 2.15.0

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/875d586b4a0c
branches:  trunk
changeset: 371057:875d586b4a0c
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 02 06:17:41 2017 +0000

description:
git: updated to 2.15.0

Git 2.15 Release Notes

Backward compatibility notes and other notable changes.

 * Use of an empty string as a pathspec element that is used for
   'everything matches' is still warned and Git asks users to use a
   more explicit '.' for that instead.  The hope is that existing
   users will not mind this change, and eventually the warning can be
   turned into a hard error, upgrading the deprecation into removal of
   this (mis)feature.  That is now scheduled to happen in Git v2.16,
   the next major release after this one.

 * Git now avoids blindly falling back to ".git" when the setup
   sequence said we are _not_ in Git repository.  A corner case that
   happens to work right now may be broken by a call to BUG().
   We've tried hard to locate such cases and fixed them, but there
   might still be cases that need to be addressed--bug reports are
   greatly appreciated.

 * "branch --set-upstream" that has been deprecated in Git 1.8 has
   finally been retired.


Updates since v2.14
-------------------

UI, Workflows & Features

 * An example that is now obsolete has been removed from a sample hook,
   and an old example in it that added a sign-off manually has been
   improved to use the interpret-trailers command.

 * The advice message given when "git rebase" stops for conflicting
   changes has been improved.

 * The "rerere-train" script (in contrib/) learned the "--overwrite"
   option to allow overwriting existing recorded resolutions.

 * "git contacts" (in contrib/) now lists the address on the
   "Reported-by:" trailer to its output, in addition to those on
   S-o-b: and other trailers, to make it easier to notify (and thank)
   the original bug reporter.

 * "git rebase", especially when it is run by mistake and ends up
   trying to replay many changes, spent long time in silence.  The
   command has been taught to show progress report when it spends
   long time preparing these many changes to replay (which would give
   the user a chance to abort with ^C).

 * "git merge" learned a "--signoff" option to add the Signed-off-by:
   trailer with the committer's name.

 * "git diff" learned to optionally paint new lines that are the same
   as deleted lines elsewhere differently from genuinely new lines.

 * "git interpret-trailers" learned to take the trailer specifications
   from the command line that overrides the configured values.

 * "git interpret-trailers" has been taught a "--parse" and a few
   other options to make it easier for scripts to grab existing
   trailer lines from a commit log message.

 * The "--format=%(trailers)" option "git log" and its friends take
   learned to take the 'unfold' and 'only' modifiers to normalize its
   output, e.g. "git log --format=%(trailers:only,unfold)".

 * "gitweb" shows a link to visit the 'raw' contents of blbos in the
   history overview page.

 * "[gc] rerereResolved = 5.days" used to be invalid, as the variable
   is defined to take an integer counting the number of days.  It now
   is allowed.

 * The code to acquire a lock on a reference (e.g. while accepting a
   push from a client) used to immediately fail when the reference is
   already locked---now it waits for a very short while and retries,
   which can make it succeed if the lock holder was holding it during
   a read-only operation.

 * "branch --set-upstream" that has been deprecated in Git 1.8 has
   finally been retired.

 * The codepath to call external process filter for smudge/clean
   operation learned to show the progress meter.

 * "git rev-parse" learned "--is-shallow-repository", that is to be
   used in a way similar to existing "--is-bare-repository" and
   friends.

 * "git describe --match <pattern>" has been taught to play well with
   the "--all" option.

 * "git branch" learned "-c/-C" to create a new branch by copying an
   existing one.

 * Some commands (most notably "git status") makes an opportunistic
   update when performing a read-only operation to help optimize later
   operations in the same repository.  The new "--no-optional-locks"
   option can be passed to Git to disable them.

 * "git for-each-ref --format=..." learned a new format element,
   %(trailers), to show only the commit log trailer part of the log
   message.


Performance, Internal Implementation, Development Support etc.

...more...

diffstat:

 devel/git-base/PLIST       |   3 ++-
 devel/git-base/distinfo    |  10 +++++-----
 devel/git/Makefile.version |   4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 5030a7b6af59 -r 875d586b4a0c devel/git-base/PLIST
--- a/devel/git-base/PLIST      Thu Nov 02 04:54:27 2017 +0000
+++ b/devel/git-base/PLIST      Thu Nov 02 06:17:41 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/05/10 18:09:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/11/02 06:18:11 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -210,6 +210,7 @@
 share/locale/bg/LC_MESSAGES/git.mo
 share/locale/ca/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
+share/locale/es/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
diff -r 5030a7b6af59 -r 875d586b4a0c devel/git-base/distinfo
--- a/devel/git-base/distinfo   Thu Nov 02 04:54:27 2017 +0000
+++ b/devel/git-base/distinfo   Thu Nov 02 06:17:41 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2017/10/24 06:43:24 adam Exp $
+$NetBSD: distinfo,v 1.73 2017/11/02 06:18:11 adam Exp $
 
-SHA1 (git-2.14.3.tar.xz) = 47f7889ff046cbd37a4aeb20c8e65f2f19df9b14
-RMD160 (git-2.14.3.tar.xz) = f88e0b91da03e8475dbf5550bbc1d4b826d536cd
-SHA512 (git-2.14.3.tar.xz) = e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
-Size (git-2.14.3.tar.xz) = 4802252 bytes
+SHA1 (git-2.15.0.tar.xz) = 22251b5aab2a6e2902a151f8e074b504984a2a3d
+RMD160 (git-2.15.0.tar.xz) = f31d9fc976ebf0bb65590835241225fdb6bd9ffb
+SHA512 (git-2.15.0.tar.xz) = 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64
+Size (git-2.15.0.tar.xz) = 4892056 bytes
 SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff -r 5030a7b6af59 -r 875d586b4a0c devel/git/Makefile.version
--- a/devel/git/Makefile.version        Thu Nov 02 04:54:27 2017 +0000
+++ b/devel/git/Makefile.version        Thu Nov 02 06:17:41 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.63 2017/10/24 06:43:24 adam Exp $
+# $NetBSD: Makefile.version,v 1.64 2017/11/02 06:17:41 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.14.3
+GIT_VERSION=   2.15.0