Changes 1.7.12:

UI, Workflows & Features
 * Git can be told to normalize pathnames it read from readdir(3) and
   all arguments it got from the command line into precomposed UTF-8
   (assuming that they come as decomposed UTF-8), in order to work
   around issues on Mac OS.
   I think there still are other places that need conversion
   (e.g. paths that are read from stdin for some commands), but this
   should be a good first step in the right direction.
 * Per-user $HOME/.gitconfig file can optionally be stored in
   $HOME/.config/git/config instead, which is in line with XDG.
 * The value of core.attributesfile and core.excludesfile default to
   $HOME/.config/git/attributes and $HOME/.config/git/ignore respectively
   when these files exist.
 * Logic to disambiguate abbreviated object names have been taught to
   take advantage of object types that are expected in the context,
   e.g. XXXXXX in the "git describe" output v1.2.3-gXXXXXX must be a
   commit object, not a blob nor a tree.  This will help us prolong
   the lifetime of abbreviated object names.
 * "git apply" learned to wiggle the base version and perform three-way
   merge when a patch does not exactly apply to the version you have.
 * Scripted Porcelain writers now have access to the credential API via
   the "git credential" plumbing command.
 * "git help" used to always default to "man" format even on platforms
   where "man" viewer is not widely available.
 * "git clone --local $path" started its life as an experiment to
   optionally use link/copy when cloning a repository on the disk, but
   we didn't deprecate it after we made the option a no-op to always
   use the optimization.  The command learned "--no-local" option to
   turn this off, as a more explicit alternative over use of file://
   URL.
 * "git fetch" and friends used to say "remote side hung up
   unexpectedly" when they failed to get response they expect from the
   other side, but one common reason why they don't get expected
   response is that the remote repository does not exist or cannot be
   read. The error message in this case was updated to give better
   hints to the user.
 * "git help -w $cmd" can show HTML version of documentation for
   "git-$cmd" by setting help.htmlpath to somewhere other than the
   default location where the build procedure installs them locally;
   the variable can even point at a http:// URL.
 * "git rebase [-i] --root $tip" can now be used to rewrite all the
   history leading to "$tip" down to the root commit.
 * "git rebase -i" learned "-x <cmd>" to insert "exec <cmd>" after
   each commit in the resulting history.
 * "git status" gives finer classification to various states of paths
   in conflicted state and offer advice messages in its output.
 * "git submodule" learned to deal with nested submodule structure
   where a module is contained within a module whose origin is
   specified as a relative URL to its superproject's origin.
 * A rather heavy-ish "git completion" script has been split to create
   a separate "git prompting" script, to help lazy-autoloading of the
   completion part while making prompting part always available.
 * "gitweb" pays attention to various forms of credits that are
   similar to "Signed-off-by:" lines in the commit objects and
   highlights them accordingly.

6 files changed, 24 insertions, 22 deletions

diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 8967a86482c..b6778451bd2 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2012/07/09 14:30:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2012/09/04 12:17:12 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -52,6 +52,7 @@ libexec/git-core/git-commit
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
+libexec/git-core/git-credential
 libexec/git-core/git-credential-cache
 libexec/git-core/git-credential-cache--daemon
 libexec/git-core/git-credential-store
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 0e7bb62034c..c0d72d6b1d7 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.59 2012/07/23 20:16:04 adam Exp $
+$NetBSD: distinfo,v 1.60 2012/09/04 12:17:12 adam Exp $
 
-SHA1 (git-1.7.11.3.tar.gz) = a10c420e4d9152d6059f41825904cfac3062b135
-RMD160 (git-1.7.11.3.tar.gz) = 0fa9a4555f4f17336c2d8c814e01cda61fbdd53f
-Size (git-1.7.11.3.tar.gz) = 4018044 bytes
-SHA1 (patch-aa) = e4c1d5a723b97056e06f966e1dbb44d330678ff1
+SHA1 (git-1.7.12.tar.gz) = 42ec1037f1ee5bfeb405710c83b73c0515ad26e6
+RMD160 (git-1.7.12.tar.gz) = 60d421d15ebb9bbf6146c5c8e7b7c94d05be0ad9
+Size (git-1.7.12.tar.gz) = 4092043 bytes
+SHA1 (patch-aa) = 5d94f08d4ee6146401e84f8ca1bde8eb1459731a
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
-SHA1 (patch-af) = a47756e1d78c07cf745040f1ba962f80fbb7b69e
+SHA1 (patch-af) = bf878f935ab895c4982ff438855faecbc50179b3
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index e69e7d080cc..310a914f4fb 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
+$NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
 
---- Makefile.orig	2012-06-21 21:55:43.000000000 +0000
+--- Makefile.orig	2012-08-20 01:22:48.000000000 +0000
 +++ Makefile
-@@ -318,8 +318,6 @@ endif
+@@ -325,8 +325,6 @@ endif
  
  CFLAGS = -g -O2 -Wall
  LDFLAGS =
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
  STRIP ?= strip
  
  # Among the variables below, these:
-@@ -354,13 +352,9 @@ pathsep = :
+@@ -361,13 +359,9 @@ pathsep = :
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -992,9 +986,10 @@ ifeq ($(uname_S),Darwin)
- 	HAVE_DEV_TTY = YesPlease
+@@ -1003,9 +997,10 @@ ifeq ($(uname_S),Darwin)
+ 	BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
  endif
  ifeq ($(uname_S),SunOS)
 +	NEED_LIBICONV = YesPlease
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
-@@ -1036,8 +1031,6 @@ ifeq ($(uname_S),SunOS)
+@@ -1048,8 +1043,6 @@ ifeq ($(uname_S),SunOS)
  		NO_STRTOUMAX = YesPlease
  		GIT_TEST_CMP = cmp
  	endif
@@ -46,8 +46,8 @@ $NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -1915,8 +1908,8 @@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHEL
- BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
+@@ -1941,8 +1934,8 @@ ifdef DEFAULT_HELP_FORMAT
+ BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
 -ALL_CFLAGS += $(BASIC_CFLAGS)
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2563,7 +2556,6 @@ ifndef NO_GETTEXT
+@@ -2634,7 +2627,6 @@ ifndef NO_GETTEXT
  endif
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 938021384d1..d5cbf93fda2 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2012/07/09 14:30:50 adam Exp $
+$NetBSD: patch-af,v 1.8 2012/09/04 12:17:12 adam Exp $
 
 --- Documentation/Makefile.orig	2010-10-22 03:49:16.000000000 +0000
 +++ Documentation/Makefile
-@@ -187,16 +187,16 @@ pdf: user-manual.pdf
+@@ -169,16 +169,16 @@ pdf: user-manual.pdf
  install: install-man
  
  install-man: man
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index faf860cf61d..ab6994cd7aa 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2012/07/09 14:30:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/09/04 12:17:12 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -27,6 +27,7 @@ man/man1/git-count-objects.1
 man/man1/git-credential-cache--daemon.1
 man/man1/git-credential-cache.1
 man/man1/git-credential-store.1
+man/man1/git-credential.1
 man/man1/git-cvsexportcommit.1
 man/man1/git-cvsimport.1
 man/man1/git-cvsserver.1
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 952c3e2feb7..475d498e8ed 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.46 2012/07/23 20:16:03 adam Exp $
+# $NetBSD: Makefile.version,v 1.47 2012/09/04 12:17:11 adam Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.7.11.3
+GIT_VERSION=	1.7.12