git: updated to 2.16.0

Git 2.16 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 now an error.

Updates since v2.15
UI, Workflows & Features

 * An empty string as a pathspec element that means "everything"
   i.e. 'git add ""', is now illegal.  We started this by first
   deprecating and warning a pathspec that has such an element in
   2.11 (Nov 2016).

 * A hook script that is set unexecutable is simply ignored.  Git
   notifies when such a file is ignored, unless the message is
   squelched via advice.ignoredHook configuration.

 * "git pull" has been taught to accept "--[no-]signoff" option and
   pass it down to "git merge".

 * The "--push-option=<string>" option to "git push" now defaults to a
   list of strings configured via push.pushOption variable.

 * "gitweb" checks if a directory is searchable with Perl's "-x"
   operator, which can be enhanced by using "filetest 'access'"
   pragma, which now we do.

 * "git stash save" has been deprecated in favour of "git stash push".

 * The set of paths output from "git status --ignored" was tied
   closely with its "--untracked=<mode>" option, but now it can be
   controlled more flexibly.  Most notably, a directory that is
   ignored because it is listed to be ignored in the ignore/exclude
   mechanism can be handled differently from a directory that ends up
   to be ignored only because all files in it are ignored.

 * The remote-helper for talking to MediaWiki has been updated to
   truncate an overlong pagename so that ".mw" suffix can still be
   added.

 * The remote-helper for talking to MediaWiki has been updated to
   work with mediawiki namespaces.

 * The "--format=..." option "git for-each-ref" takes learned to show
   the name of the 'remote' repository and the ref at the remote side
   that is affected for 'upstream' and 'push' via "%(push:remotename)"
   and friends.

 * Doc and message updates to teach users "bisect view" is a synonym
   for "bisect visualize".

 * "git bisect run" that did not specify any command to run used to go
   ahead and treated all commits to be tested as 'good'.  This has
   been corrected by making the command error out.

 * The SubmittingPatches document has been converted to produce an
   HTML version via AsciiDoc/Asciidoctor.

 * We learned to optionally talk to a file system monitor via new
   fsmonitor extension to speed up "git status" and other operations
   that need to see which paths have been modified.  Currently we only
   support "watchman".  See File System Monitor section of
   git-update-index(1) for more detail.

 * The "diff" family of commands learned to ignore differences in
   carriage return at the end of line.

 * Places that know about "sendemail.to", like documentation and shell
   completion (in contrib/) have been taught about "sendemail.tocmd",
   too.

 * "git add --renormalize ." is a new and safer way to record the fact
   that you are correcting the end-of-line convention and other
   "convert_to_git()" glitches in the in-repository data.

 * "git branch" and "git checkout -b" are now forbidden from creating
   a branch whose name is "HEAD".

 * "git branch --list" learned to show its output through the pager by
   default when the output is going to a terminal, which is controlled
   by the pager.branch configuration variable.  This is similar to a
   recent change to "git tag --list".

 * "git grep -W", "git diff -W" and their friends learned a heuristic
   to extend a pre-context beyond the line that matches the "function
   pattern" (aka "diff.*.xfuncname") to include a comment block, if
   exists, that immediately precedes it.

 * "git config --expiry-date gc.reflogexpire" can read "2.weeks" from
   the configuration and report it as a timestamp, just like "--int"
   would read "1k" and report 1024, to help consumption by scripts.

 * The shell completion (in contrib/) learned that "git pull" can take
   the "--autostash" option.

 * The tagnames "git log --decorate" uses to annotate the commits can
   now be limited to subset of available refs with the two additional
   options, --decorate-refs[-exclude]=<pattern>.

 * "git grep" compiled with libpcre2 sometimes triggered a segfault,
   which is being fixed.

 * "git send-email" tries to see if the sendmail program is available
   in /usr/lib and /usr/sbin; extend the list of locations to be
   checked to also include directories on $PATH.

 * "git diff" learned, "--anchored", a variant of the "--patience"
   algorithm, to which the user can specify which 'unique' line to be
   used as anchoring points.

 * The way "git worktree add" determines what branch to create from
   where and checkout in the new worktree has been updated a bit.

 * Ancient part of codebase still shows dots after an abbreviated
   object name just to show that it is not a full object name, but
   these ellipses are confusing to people who newly discovered Git
   who are used to seeing abbreviated object names and find them
   confusing with the range syntax.

 * With a configuration variable rebase.abbreviateCommands set,
   "git rebase -i" produces the todo list with a single-letter
   command names.

 * "git worktree add" learned to run the post-checkout hook, just like
   "git checkout" does, after the initial checkout.

 * "git svn" has been updated to strip CRs in the commit messages, as
   recent versions of Subversion rejects them.

 * "git imap-send" did not correctly quote the folder name when
   making a request to the server, which has been corrected.

 * Error messages from "git rebase" have been somewhat cleaned up.

 * Git has been taught to support an https:// URL used for http.proxy
   when using recent versions of libcurl.

 * "git merge" learned to pay attention to merge.verifySignatures
   configuration variable and pretend as if '--verify-signatures'
   option was given from the command line.

 * "git describe" was taught to dig trees deeper to find a
   <commit-ish>:<path> that refers to a given blob object.

4 files changed, 10 insertions, 10 deletions

diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index ca8a469004f..53396907f98 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.48 2018/01/01 21:18:20 adam Exp $
+# $NetBSD: Makefile,v 1.49 2018/01/22 14:17:24 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=	git-base-${GIT_VERSION}
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index b4a3317e566..9ea86814875 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/11/02 06:18:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/01/22 14:17:24 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -198,6 +198,7 @@ share/examples/git/git-prompt.sh
 share/examples/git/templates/description
 share/examples/git/templates/hooks/applypatch-msg.sample
 share/examples/git/templates/hooks/commit-msg.sample
+share/examples/git/templates/hooks/fsmonitor-watchman.sample
 share/examples/git/templates/hooks/post-update.sample
 share/examples/git/templates/hooks/pre-applypatch.sample
 share/examples/git/templates/hooks/pre-commit.sample
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 05a8dd80a42..a8b809fddfa 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.74 2017/11/30 07:50:01 adam Exp $
+$NetBSD: distinfo,v 1.75 2018/01/22 14:17:24 adam Exp $
 
-SHA1 (git-2.15.1.tar.xz) = 0ff2d0c64621f92e15759b2ca07838858bef8ff0
-RMD160 (git-2.15.1.tar.xz) = 4faa07120bec5376a76330cdebe5b43e283856d7
-SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
-Size (git-2.15.1.tar.xz) = 4894768 bytes
+SHA1 (git-2.16.0.tar.xz) = 760005fedd36a0d06a0730bc0340a95421198522
+RMD160 (git-2.16.0.tar.xz) = fc6cfc7e47becb293ca0b8b6692504fdcb985d3c
+SHA512 (git-2.16.0.tar.xz) = 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812
+Size (git-2.16.0.tar.xz) = 4961856 bytes
 SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 135b75d2b6b..3474c4167b8 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.65 2017/11/30 07:50:01 adam Exp $
+# $NetBSD: Makefile.version,v 1.66 2018/01/22 14:17:24 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.15.1
+GIT_VERSION=	2.16.0