Changes 1.7.3.5:

* The xfuncname pattern used by "git diff" and "git grep" to show the
  last notable line in context were broken for python and ruby for a long
  time.
* "git merge" into an unborn branch removed an untracked file "foo" from
  the working tree when merged branch had "foo" (this fix was already in
  1.7.3.3 but was omitted from the release notes by mistake).
* "git status -s" did not quote unprintable characters in paths as
  documented.
* "git am --abort" used to always reset to the commit at the beginning of
  the last "am" invocation that has stopped, losing any unrelated commits
  that may have been made since then.  Now it refrains from doing so and
  instead issues a warning.
* "git blame" incorrectly reused bogusly cached result of textconv
  filter for files from the working tree.
* "git commit" used to abort after the user edited the log message
  when the committer information was not correctly set up.  It now
  aborts before starting the editor.
* "git commit --date=invalid" used to silently ignore the incorrectly
  specified date; it is now diagnosed as an error.
* "git rebase --skip" to skip the last commit in a series used to fail
  to run post-rewrite hook and to copy notes from old commits that have
  successfully been rebased so far.  Now it do (backmerge ef88ad2).
* "gitweb" tried to show a wrong feed logo when none was specified.

4 files changed, 14 insertions, 18 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index d1582f5abde..e396d680fa0 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/12/23 23:42:40 abs Exp $
-#
+# $NetBSD: Makefile,v 1.28 2011/01/28 08:11:30 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=		scmgit-base-${GIT_VERSION}
-PKGREVISION=		1
 COMMENT=		GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -40,12 +38,11 @@ GIT_COREDIR=		git-core
 GIT_TEMPLATEDIR=	templates
 
 GIT_TEMPLATES=		description info/exclude
-GIT_TEMPLATES+=		hooks/applypatch-msg.sample hooks/commit-msg.sample 	\
-			hooks/post-commit.sample hooks/post-receive.sample	\
-			hooks/post-update.sample hooks/pre-applypatch.sample	\
-			hooks/pre-commit.sample hooks/pre-rebase.sample		\
-			hooks/prepare-commit-msg.sample hooks/update.sample
-GIT_TEMPLATES+=
+GIT_TEMPLATES+=		hooks/applypatch-msg.sample hooks/commit-msg.sample
+GIT_TEMPLATES+=		hooks/post-commit.sample hooks/post-receive.sample
+GIT_TEMPLATES+=		hooks/post-update.sample hooks/pre-applypatch.sample
+GIT_TEMPLATES+=		hooks/pre-commit.sample hooks/pre-rebase.sample
+GIT_TEMPLATES+=		hooks/prepare-commit-msg.sample hooks/update.sample
 
 # XXX unused as of now
 #GIT_CORE_EXECDIR=	libexec/${GIT_COREDIR}
@@ -61,7 +58,6 @@ REQD_FILES+=		${GIT_TEMPLATES:@.t.@\
 				${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
 			@:M*}
 
-
 CONFIGURE_ENV+=		HOME=${PREFIX}
 CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR}
 
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index eaf6a5c4ac6..0e4305254c1 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2010/12/23 23:42:40 abs Exp $
+$NetBSD: distinfo,v 1.31 2011/01/28 08:11:30 adam Exp $
 
-SHA1 (git-1.7.3.4.tar.bz2) = 8bda6668531fc41a72a680978798deb9ee048846
-RMD160 (git-1.7.3.4.tar.bz2) = 37cdb8b50c802655643a243ef26fe3d50145d29c
-Size (git-1.7.3.4.tar.bz2) = 2635522 bytes
+SHA1 (git-1.7.3.5.tar.bz2) = cf9587ecf7cae04463d05b9f9ce8990913bd925a
+RMD160 (git-1.7.3.5.tar.bz2) = 3ad6eb187b7a901addb3ee5a2ade70ba550007f6
+Size (git-1.7.3.5.tar.bz2) = 2635455 bytes
 SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 39c88b79c50..4d535721d0b 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2010/10/28 10:23:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2011/01/28 08:11:30 adam Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -21,7 +21,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PATCHDIR=	${.CURDIR}/../../devel/scmgit-base/patches
 DISTINFO_FILE=	${.CURDIR}/../../devel/scmgit-base/distinfo
 
-GNU_CONFIGURE?=	yes
+GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake tar perl sh
 EXTRACT_USING=		gtar
 
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index b0c02442ede..935d34c2000 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.17 2010/12/17 01:05:23 gdt Exp $
+# $NetBSD: Makefile.version,v 1.18 2011/01/28 08:11:30 adam Exp $
 #
-GIT_VERSION=	1.7.3.4
+GIT_VERSION=	1.7.3.5