Changes 1.7.3.2:

This is primarily to push out many documentation fixes accumulated since
the 1.7.3.1 release.

Changes 1.7.3.1:
* "git stash show stash@{$n}" was accidentally broken in 1.7.3 ("git
  stash show" without any argument still worked, though).
* "git stash branch $branch stash@{$n}" was accidentally broken in
  1.7.3 and started dropping the named stash even when branch creation
  failed.

Changes 1.7.3:
* git-gui, now at version 0.13.0, got various updates and a new
  maintainer, Pat Thoyts.
* Gitweb allows its configuration to change per each request; it used to
  read the configuration once upon startup.
* When git finds a corrupt object, it now reports the file that contains
  it.
* "git checkout -B <it>" is a shorter way to say "git branch -f <it>"
  followed by "git checkout <it>".
* When "git checkout" or "git merge" refuse to proceed in order to
  protect local modification to your working tree, they used to stop
  after showing just one path that might be lost.  They now show all,
  in a format that is easier to read.
* "git clean" learned "-e" ("--exclude") option.
* Hunk headers produced for C# files by "git diff" and friends show more
  relevant context than before.
* diff.ignoresubmodules configuration variable can be used to squelch the
  differences in submodules reported when running commands (e.g. "diff",
  "status", etc.) at the superproject level.
* http.useragent configuration can be used to lie who you are to your
  restrictive firewall.
* "git rebase --strategy <s>" learned "-X" option to pass extra options
  that are understood by the chosen merge strategy.
* "git rebase -i" learned "exec" that you can insert into the insn sheet
  to run a command between its steps.
* "git rebase" between branches that have many binary changes that do
  not conflict should be faster.
* "git rebase -i" peeks into rebase.autosquash configuration and acts as
  if you gave --autosquash from the command line.

10 files changed, 75 insertions, 49 deletions

diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index c8499be8888..3196349514d 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/07/13 11:11:48 sbd Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/10/28 10:23:08 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -12,8 +12,16 @@ ${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.pyc
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.pyc
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc
 libexec/git-core/git
@@ -126,6 +134,7 @@ libexec/git-core/git-remote-ftp
 libexec/git-core/git-remote-ftps
 libexec/git-core/git-remote-http
 libexec/git-core/git-remote-https
+libexec/git-core/git-remote-testgit
 libexec/git-core/git-repack
 libexec/git-core/git-replace
 libexec/git-core/git-repo-config
@@ -243,4 +252,9 @@ ${PLIST.gui}share/gitk/lib/msgs/it.msg
 ${PLIST.gui}share/gitk/lib/msgs/ja.msg
 ${PLIST.gui}share/gitk/lib/msgs/ru.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
+share/gitweb/gitweb.cgi
+share/gitweb/static/git-favicon.png
+share/gitweb/static/git-logo.png
+share/gitweb/static/gitweb.css
+share/gitweb/static/gitweb.js
 @pkgdir share/examples/scmgit/templates/branches
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 2ecd8b8b921..d0fac08e823 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.27 2010/10/11 20:46:21 minskim Exp $
+$NetBSD: distinfo,v 1.28 2010/10/28 10:23:08 adam Exp $
 
-SHA1 (git-1.7.0.7.tar.gz) = 1fdbf77c5bf7a5b9be8388085165bab99d1dd686
-RMD160 (git-1.7.0.7.tar.gz) = 9a768fac1a4786991df4970252a05a57a620819d
-Size (git-1.7.0.7.tar.gz) = 2953355 bytes
-SHA1 (patch-aa) = 8356e00a82567ecad200b61daa91a453755407dd
+SHA1 (git-1.7.3.2.tar.bz2) = cd8d806752aa6f5716cf193585024a002e098bf4
+RMD160 (git-1.7.3.2.tar.bz2) = b645fc9e82eff3e186398280bc0a4ad72089b457
+Size (git-1.7.3.2.tar.bz2) = 2630629 bytes
+SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
-SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
-SHA1 (patch-ag) = 048d9449048e417fab01c3e0e8e6e81d9df3bfac
+SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a
+SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
-SHA1 (patch-al) = a4850307f1d8eb49887011dd17429ad1d3b457fe
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index ccaf7debf71..a863717e937 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,21 +1,31 @@
-$NetBSD: patch-aa,v 1.12 2010/04/28 22:01:43 morr Exp $
+$NetBSD: patch-aa,v 1.13 2010/10/28 10:23:08 adam Exp $
 
---- Makefile.orig	2010-04-12 19:23:36.000000000 +0400
-+++ Makefile	2010-04-16 14:07:10.000000000 +0400
-@@ -277,12 +277,8 @@
+--- Makefile.orig	2010-10-22 03:49:16.000000000 +0000
++++ Makefile
+@@ -259,8 +259,6 @@ endif
  
- export prefix bindir sharedir sysconfdir
+ CFLAGS = -g -O2 -Wall
+ LDFLAGS =
+-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+-ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+ 
+ # Among the variables below, these:
+@@ -298,13 +296,9 @@ pathsep = :
+ 
+ export prefix bindir sharedir sysconfdir gitwebdir
  
 -CC = gcc
 -AR = ar
  RM = rm -f
+ DIFF = diff
 -TAR = tar
  FIND = find
 -INSTALL = install
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -762,9 +758,10 @@
+@@ -834,9 +828,10 @@ ifeq ($(uname_S),Darwin)
  	USE_ST_TIMESPEC = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -27,12 +37,23 @@ $NetBSD: patch-aa,v 1.12 2010/04/28 22:01:43 morr Exp $
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
-@@ -793,8 +790,6 @@
- 		NO_C99_FORMAT = YesPlease
+@@ -880,8 +875,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
  endif
  ifeq ($(uname_O),Cygwin)
+@@ -1563,8 +1556,8 @@ DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(D
+ BASIC_CFLAGS += -DDEFAULT_PAGER='$(DEFAULT_PAGER_CQ_SQ)'
+ endif
+ 
+-ALL_CFLAGS += $(BASIC_CFLAGS)
+-ALL_LDFLAGS += $(BASIC_LDFLAGS)
++ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
++ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
+ 
+ export DIFF TAR INSTALL DESTDIR SHELL_PATH
+ 
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 53bb2dff8cf..e21f7ae1d6e 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2009/05/05 06:21:16 minskim Exp $
+$NetBSD: patch-af,v 1.5 2010/10/28 10:23:08 adam Exp $
 
---- Documentation/Makefile.orig	2009-03-04 08:18:50.000000000 +0000
+--- Documentation/Makefile.orig	2010-10-22 03:49:16.000000000 +0000
 +++ Documentation/Makefile
-@@ -94,16 +94,16 @@ pdf: user-manual.pdf
+@@ -180,16 +180,16 @@ pdf: user-manual.pdf
  install: install-man
  
  install-man: man
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index 59f451da52d..0124684a47d 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2010/01/15 10:36:41 wiz Exp $
+$NetBSD: patch-ag,v 1.8 2010/10/28 10:23:08 adam Exp $
 
---- templates/Makefile.orig	2009-12-24 00:00:22.000000000 +0000
+--- templates/Makefile.orig	2010-10-22 03:49:16.000000000 +0000
 +++ templates/Makefile
 @@ -8,7 +8,7 @@ INSTALL ?= install
  TAR ?= tar
@@ -10,8 +10,8 @@ $NetBSD: patch-ag,v 1.7 2010/01/15 10:36:41 wiz Exp $
 +template_instdir = ${GIT_TEMPLATE_INSTDIR}
  # DESTDIR=
  
- # Shell quote (do not use $(call) to accommodate ancient setups);
-@@ -29,7 +29,7 @@ boilerplates.made : $(bpsrc)
+ ifndef SHELL_PATH
+@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc)
  		case "$$boilerplate" in *~) continue ;; esac && \
  		dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
  		dir=`expr "$$dst" : '\(.*\)/'` && \
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.7 2010/01/15 10:36:41 wiz Exp $
  		case "$$boilerplate" in \
  		*--) continue;; \
  		esac && \
-@@ -48,6 +48,6 @@ clean:
+@@ -61,6 +61,6 @@ clean:
  	$(RM) -r blt boilerplates.made
  
  install: all
diff --git a/devel/scmgit-base/patches/patch-al b/devel/scmgit-base/patches/patch-al
deleted file mode 100644
index 33025b94c3a..00000000000
--- a/devel/scmgit-base/patches/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/04/04 08:12:03 obache Exp $
-
-Fix _XOPEN_SOURCE problem on DragonFly
-http://repo.or.cz/w/git.git/commit/6555b196f00128f13ab8f719ee1e156238f16bb3
-
---- git-compat-util.h.orig	2010-02-10 23:12:51.000000000 +0000
-+++ git-compat-util.h
-@@ -55,7 +55,8 @@
- # else
- # define _XOPEN_SOURCE 500
- # endif
--#elif !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi)
-+#elif !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && \
-+      !defined(_M_UNIX) && !defined(sgi) && !defined(__DragonFly__)
- #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
- #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
- #endif
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
index 840c5456a4d..c4d2e1b72ea 100644
--- a/devel/scmgit-docs/Makefile
+++ b/devel/scmgit-docs/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/02/22 09:20:30 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2010/10/28 10:23:08 adam Exp $
 
 PKGNAME=		scmgit-docs-${GIT_VERSION}
 COMMENT=		GIT Tree History Storage Tool (documentation)
@@ -20,6 +19,14 @@ INSTALL_TARGET=		install-doc
 
 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-docs/PLIST b/devel/scmgit-docs/PLIST
index 005e144adea..cca196585f2 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/01/15 10:36:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/10/28 10:23:08 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -148,6 +148,7 @@ man/man7/gitcore-tutorial.7
 man/man7/gitcvs-migration.7
 man/man7/gitdiffcore.7
 man/man7/gitglossary.7
+man/man7/gitrevisions.7
 man/man7/gittutorial-2.7
 man/man7/gittutorial.7
 man/man7/gitworkflows.7
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 11036e6567f..39c88b79c50 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2010/01/15 10:36:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2010/10/28 10:23:07 adam Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -8,6 +8,7 @@
 DISTNAME=	git-${GIT_VERSION}
 CATEGORIES=	devel scm
 MASTER_SITES?=	http://www.kernel.org/pub/software/scm/git/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	bjs@NetBSD.org
 HOMEPAGE?=	http://git.or.cz/
@@ -30,4 +31,4 @@ CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-shell=${SH:Q}
 CONFIGURE_ARGS+=	--with-tar=${TAR:Q}
 CONFIGURE_ARGS+=	--mandir=${${PREFIX}/${PKGMANDIR}:L:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 41905f9eff4..3425d38d728 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.15 2010/10/11 20:46:20 minskim Exp $
+# $NetBSD: Makefile.version,v 1.16 2010/10/28 10:23:07 adam Exp $
 #
-GIT_VERSION=	1.7.0.7
+GIT_VERSION=	1.7.3.2