Changes 1.7.4.3:

* "git apply" used to confuse lines updated by previous hunks as lines
  that existed before when applying a hunk, contributing misapplication
  of patches with offsets.
* "git branch --track" (and "git checkout --track --branch") used to
  allow setting up a random non-branch that does not make sense to follow
  as the "upstream".  The command correctly diagnoses it as an error.
* "git checkout $other_branch" silently removed untracked symbolic links
  in the working tree that are in the way in order to check out paths
  under it from the named branch.
* "git cvsimport" did not bail out immediately when the cvs server cannot
  be reached, spewing unnecessary error messages that complain about the
  server response that it never got.
* "git diff --quiet" did not work very well with the "--diff-filter" option.
* "git grep -n" lacked a long-hand synonym --line-number.
* "git stash apply" reported the result of its operation by running
  "git status" from the top-level of the working tree; it should (and
  now does) run it from the user's working directory.

4 files changed, 23 insertions, 17 deletions

diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 9b226b24317..ece226ef426 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.32 2011/03/11 09:28:39 adam Exp $
+$NetBSD: distinfo,v 1.33 2011/04/06 14:08:27 adam Exp $
 
-SHA1 (git-1.7.4.1.tar.bz2) = fff10cb498b17decc146c8f18b0b02136d5e9b88
-RMD160 (git-1.7.4.1.tar.bz2) = 13ef7b6d1e8b596f97a1920e012a00f6cc8cdf6c
-Size (git-1.7.4.1.tar.bz2) = 2703860 bytes
+SHA1 (git-1.7.4.3.tar.bz2) = 6662424ec4bee798b791eba9b87877417c06edb7
+RMD160 (git-1.7.4.3.tar.bz2) = 76e4f10825830077b085931dbb7f03aadbb58020
+Size (git-1.7.4.3.tar.bz2) = 2708240 bytes
 SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
+SHA1 (patch-ab) = 43f8516c50782d065c5a67d0377dbde65a0fe189
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
 SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
new file mode 100644
index 00000000000..ec8c245d9e8
--- /dev/null
+++ b/devel/scmgit-base/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.9 2011/04/06 14:08:27 adam Exp $
+
+--- sha1_file.c.orig	2011-04-06 13:38:06.000000000 +0000
++++ sha1_file.c
+@@ -17,6 +17,8 @@
+ #include "pack-revindex.h"
+ #include "sha1-lookup.h"
+ 
++#include <sys/resource.h>
++
+ #ifndef O_NOATIME
+ #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
+ #define O_NOATIME 01000000
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
index 96e701d9799..ad0d939d135 100644
--- a/devel/scmgit-docs/Makefile
+++ b/devel/scmgit-docs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/10/28 11:11:00 adam Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/06 14:08:27 adam Exp $
 
-PKGNAME=		scmgit-docs-${GIT_VERSION}
-COMMENT=		GIT Tree History Storage Tool (documentation)
+PKGNAME=	scmgit-docs-${GIT_VERSION}
+COMMENT=	GIT Tree History Storage Tool (documentation)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,14 +18,6 @@ INSTALL_TARGET=		install-man
 
 UNLIMIT_RESOURCES+=	datasize
 
-# our asciidoc doesn't handle {litdd} in titles
-SUBST_CLASSES+=		litdd
-SUBST_STAGE.litdd=	pre-configure
-SUBST_MESSAGE.litdd=	Fixing {litdd} in text files.
-SUBST_FILES.litdd=	Documentation/git-*--*.txt
-SUBST_SED.litdd=	-e 's,{litdd},--,g'
-SUBST_SED.litdd+=	-e 's,^=====,,g'
-
 .include "../../devel/scmgit/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 512820f602f..61d16510ce6 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.19 2011/03/11 09:28:39 adam Exp $
+# $NetBSD: Makefile.version,v 1.20 2011/04/06 14:08:27 adam Exp $
 
-GIT_VERSION=	1.7.4.1
+GIT_VERSION=	1.7.4.3