Changes 2.1.0:

Backward compatibility notes
----------------------------
 * The default value we give to the environment variable LESS has been
   changed from "FRSX" to "FRX", losing "S" (chop long lines instead
   of wrapping).  Existing users who prefer not to see line-wrapped
   output may want to set
     $ git config core.pager "less -S"
   to restore the traditional behaviour.  It is expected that people
   find output from most subcommands easier to read with the new
   default, except for "blame" which tends to produce really long
   lines.  To override the new default only for "git blame", you can
   do this:
     $ git config pager.blame "less -S"
 * A few disused directories in contrib/ have been retired.

Updates since v2.0
------------------
UI, Workflows & Features
 * Since the very beginning of Git, we gave the LESS environment a
   default value "FRSX" when we spawn "less" as the pager.  "S" (chop
   long lines instead of wrapping) has been removed from this default
   set of options, because it is more or less a personal taste thing,
   as opposed to the others that have good justifications (i.e. "R" is
   very much justified because many kinds of output we produce are
   colored and "FX" is justified because output we produce is often
   shorter than a page).
 * The logic and data used to compute the display width needed for
   UTF-8 strings have been updated to match Unicode 7.0 better.
 * HTTP-based transports learned to better propagate the error messages from
   the webserver to the client coming over the HTTP transport.
 * The completion script for bash (in contrib/) has been updated to
   better handle aliases that define a complex sequence of commands.
 * The "core.preloadindex" configuration variable is enabled by default,
   allowing modern platforms to take advantage of their
   multiple cores.
 * "git clone" applies the "if cloning from a local disk, physically
   copy the repository using hardlinks, unless otherwise told not to with
   --no-local" optimization when the url.*.insteadOf mechanism rewrites a
   remote-repository "git clone $URL" into a
   clone from a local disk.
 * "git commit --date=<date>" option learned more
   timestamp formats, including "--date=now".
 * The `core.commentChar` configuration variable is used to specify a
   custom comment character (other than the default "#") for
   the commit message editor.  This can be set to `auto` to attempt to
   choose a different character that does not conflict with any that
   already starts a line in the message being edited, for cases like
   "git commit --amend".
 * "git format-patch" learned --signature-file=<file> to add the contents
   of a file as a signature to the mail message it produces.
 * "git grep" learned the grep.fullname configuration variable to force
   "--full-name" to be the default.  This may cause regressions for
   scripted users who do not expect this new behaviour.
 * "git imap-send" learned to ask the credential helper for auth
   material.
 * "git log" and friends now understand the value "auto" for the
   "log.decorate" configuration variable to enable the "--decorate"
   option automatically when the output is sent to tty.
 * "git merge" without an argument, even when there is an upstream
   defined for the current branch, refused to run until
   merge.defaultToUpstream is set to true.  Flip the default of that
   configuration variable to true.
 * "git mergetool" learned to drive the vimdiff3 backend.
 * mergetool.prompt used to default to 'true', always asking "do you
   really want to run the tool on this path?".  The default has been
   changed to 'false'.  However, the prompt will still appear if
   mergetool used its autodetection system to guess which tool to use.
   Users who explicitly specify or configure a tool will no longer see
   the prompt by default.
   Strictly speaking, this is a backward incompatible change and
   users need to explicitly set the variable to 'true' if they want
   to be prompted to confirm running the tool on each path.
 * "git replace" learned the "--edit" subcommand to create a
   replacement by editing an existing object.
 * "git replace" learned a "--graft" option to rewrite the parents of a
   commit.
 * "git send-email" learned "--to-cover" and "--cc-cover" options, to
   tell it to copy To: and Cc: headers found in the first input file
   when emitting later input files.
 * "git svn" learned to cope with malformed timestamps with only one
   digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted
   by some broken subversion server implementations.
 * "git tag" when editing the tag message shows the name of the tag
   being edited as a comment in the editor.
 * "git tag" learned to pay attention to "tag.sort" configuration, to
   be used as the default sort order when no --sort=<value> option
   is given.
 * A new "git verify-commit" command, to check GPG signatures in signed
   commits, in a way similar to "git verify-tag" is used to check
   signed tags, was added.

7 files changed, 22 insertions, 18 deletions

diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index b902b0e4f2e..d955bd0e62b 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2014/08/01 19:18:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/25 07:49:08 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]*
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index 23891c85ab1..16bb7ecab0b 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/05/28 12:08:53 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/08/25 07:49:08 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -159,6 +159,7 @@ libexec/git-core/git-update-server-info
 libexec/git-core/git-upload-archive
 libexec/git-core/git-upload-pack
 libexec/git-core/git-var
+libexec/git-core/git-verify-commit
 libexec/git-core/git-verify-pack
 libexec/git-core/git-verify-tag
 libexec/git-core/git-web--browse
@@ -174,6 +175,7 @@ libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
+libexec/git-core/mergetools/gvimdiff3
 libexec/git-core/mergetools/kdiff3
 libexec/git-core/mergetools/kompare
 libexec/git-core/mergetools/meld
@@ -183,6 +185,7 @@ libexec/git-core/mergetools/tkdiff
 libexec/git-core/mergetools/tortoisemerge
 libexec/git-core/mergetools/vimdiff
 libexec/git-core/mergetools/vimdiff2
+libexec/git-core/mergetools/vimdiff3
 libexec/git-core/mergetools/xxdiff
 share/examples/git/git-completion.bash
 share/examples/git/git-prompt.sh
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 0362179cbaa..90351b04d9b 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2014/08/01 19:18:39 schmonz Exp $
+$NetBSD: distinfo,v 1.16 2014/08/25 07:49:08 adam Exp $
 
-SHA1 (git-1.9.4.tar.xz) = a91059d0065d82c6c2db6d69b56033a01b10eac8
-RMD160 (git-1.9.4.tar.xz) = 742b8d73fa205b34b2c2843260d94787099b6030
-Size (git-1.9.4.tar.xz) = 3387180 bytes
+SHA1 (git-2.1.0.tar.xz) = d647e6a7a1989f6a8152a96e96e089735552d34c
+RMD160 (git-2.1.0.tar.xz) = ab1d1d873ded6162f45a3c15a291b31a4b77e5e9
+Size (git-2.1.0.tar.xz) = 3485524 bytes
 SHA1 (patch-aa) = 62170081fcf3831ba7316b5914657063c668a80b
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
@@ -10,5 +10,5 @@ SHA1 (patch-af) = d1aae6d9b15f7932912a97457d8a95364b685b07
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
-SHA1 (patch-config.mak.uname) = f18aafb64828f3c3e49321d6ef9756fff42c2056
+SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
diff --git a/devel/git-base/patches/patch-config.mak.uname b/devel/git-base/patches/patch-config.mak.uname
index d53e08bbb2b..c1c1a231df0 100644
--- a/devel/git-base/patches/patch-config.mak.uname
+++ b/devel/git-base/patches/patch-config.mak.uname
@@ -1,22 +1,22 @@
-$NetBSD: patch-config.mak.uname,v 1.3 2014/02/23 10:00:27 adam Exp $
+$NetBSD: patch-config.mak.uname,v 1.4 2014/08/25 07:49:08 adam Exp $
 
---- config.mak.uname.orig	Tue Dec  3 19:34:59 2013
+--- config.mak.uname.orig	2014-08-15 22:26:55.000000000 +0000
 +++ config.mak.uname
-@@ -101,7 +101,7 @@ endif
+@@ -104,7 +104,7 @@ endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
 -	SHELL_PATH = /bin/bash
 +	SHELL_PATH = ${BASH}
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
+ 	HAVE_ALLOCA_H = YesPlease
  	NO_STRCASESTR = YesPlease
- 	NO_MEMMEM = YesPlease
-@@ -144,8 +144,6 @@ ifeq ($(uname_S),SunOS)
+@@ -147,8 +147,6 @@ ifeq ($(uname_S),SunOS)
  		NO_STRTOUMAX = YesPlease
  		GIT_TEST_CMP = cmp
  	endif
 -	INSTALL = /usr/ucb/install
 -	TAR = gtar
- 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
+ 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__
  endif
  ifeq ($(uname_O),Cygwin)
diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST
index 19363852950..579ff823d1a 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/23 10:00:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/25 07:49:08 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -139,6 +139,7 @@ man/man1/git-update-server-info.1
 man/man1/git-upload-archive.1
 man/man1/git-upload-pack.1
 man/man1/git-var.1
+man/man1/git-verify-commit.1
 man/man1/git-verify-pack.1
 man/man1/git-verify-tag.1
 man/man1/git-web--browse.1
diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST
index 75f35d13bee..2c7b9ccefa3 100644
--- a/devel/git-gitk/PLIST
+++ b/devel/git-gitk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/23 10:00:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/25 07:49:08 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -72,3 +72,4 @@ share/gitk/lib/msgs/ja.msg
 share/gitk/lib/msgs/pt_br.msg
 share/gitk/lib/msgs/ru.msg
 share/gitk/lib/msgs/sv.msg
+share/gitk/lib/msgs/vi.msg
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 4192c3ee9df..2b295cef354 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.12 2014/06/02 16:32:36 adam Exp $
+# $NetBSD: Makefile.version,v 1.13 2014/08/25 07:49:08 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	1.9.4
+GIT_VERSION=	2.1.0