Changes 2.4.1:

* The usual "git diff" when seeing a file turning into a directory
  showed a patchset to remove the file and create all files in the
  directory, but "git diff --no-index" simply refused to work.  Also,
  when asked to compare a file and a directory, imitate POSIX "diff"
  and compare the file with the file with the same name in the
  directory, instead of refusing to run.

* The default $HOME/.gitconfig file created upon "git config --global"
  that edits it had incorrectly spelled user.name and user.email
  entries in it.

* "git commit --date=now" or anything that relies on approxidate lost
  the daylight-saving-time offset.

* "git cat-file bl $blob" failed to barf even though there is no
  object type that is "bl".

* Teach the codepaths that read .gitignore and .gitattributes files
  that these files encoded in UTF-8 may have UTF-8 BOM marker at the
  beginning; this makes it in line with what we do for configuration
  files already.

* Access to objects in repositories that borrow from another one on a
  slow NFS server unnecessarily got more expensive due to recent code
  becoming more cautious in a naive way not to lose objects to pruning.

* We avoid setting core.worktree when the repository location is the
  ".git" directory directly at the top level of the working tree, but
  the code misdetected the case in which the working tree is at the
  root level of the filesystem (which arguably is a silly thing to
  do, but still valid).

Also contains typofixes, documentation updates and trivial code
clean-ups.

4 files changed, 11 insertions, 8 deletions

diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index d64a0037a97..d2f71c1eac5 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/11/30 18:43:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/05/18 12:51:37 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -209,6 +209,7 @@ share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
 share/locale/pt_PT/LC_MESSAGES/git.mo
+share/locale/ru/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo
 share/locale/vi/LC_MESSAGES/git.mo
 share/locale/zh_CN/LC_MESSAGES/git.mo
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 16cea2eb506..441d65ef1c1 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2015/04/25 09:02:45 adam Exp $
+$NetBSD: distinfo,v 1.27 2015/05/18 12:51:37 adam Exp $
 
-SHA1 (git-2.3.6.tar.xz) = 7fda9e3d9d4f51f26e84a75f02d3a19c727566f3
-RMD160 (git-2.3.6.tar.xz) = 51a74e198e7612668affa595e36f451f7bdf8208
-Size (git-2.3.6.tar.xz) = 3621716 bytes
+SHA1 (git-2.4.1.tar.xz) = 57c6d886fd5412664335e966954f2c384cfa1ee1
+RMD160 (git-2.4.1.tar.xz) = 9d6419ca7aeb2d95ddbf31f07904644bfee42bc1
+Size (git-2.4.1.tar.xz) = 3682912 bytes
 SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST
index 2c7b9ccefa3..a645ccfbf3f 100644
--- a/devel/git-gitk/PLIST
+++ b/devel/git-gitk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/08/25 07:49:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/05/18 12:51:37 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -45,6 +45,7 @@ share/git-gui/lib/msgs/nb.msg
 share/git-gui/lib/msgs/pt_br.msg
 share/git-gui/lib/msgs/ru.msg
 share/git-gui/lib/msgs/sv.msg
+share/git-gui/lib/msgs/vi.msg
 share/git-gui/lib/msgs/zh_cn.msg
 share/git-gui/lib/option.tcl
 share/git-gui/lib/remote.tcl
@@ -63,6 +64,7 @@ share/git-gui/lib/transport.tcl
 share/git-gui/lib/win32.tcl
 share/git-gui/lib/win32_shortcut.js
 share/gitk/lib/msgs/bg.msg
+share/gitk/lib/msgs/ca.msg
 share/gitk/lib/msgs/de.msg
 share/gitk/lib/msgs/es.msg
 share/gitk/lib/msgs/fr.msg
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 1b68d0add0d..5551f55cd28 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.22 2015/04/25 09:02:45 adam Exp $
+# $NetBSD: Makefile.version,v 1.23 2015/05/18 12:51:37 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.3.6
+GIT_VERSION=	2.4.1