Changes 1.7.7:

* The scripting part of the codebase is getting prepared for i18n/l10n.
* Interix, Cygwin and Minix ports got updated.
* Various updates to git-p4 (in contrib/), fast-import, and git-svn.
* Gitweb learned to read from /etc/gitweb-common.conf when it exists,
  before reading from gitweb_config.perl or from /etc/gitweb.conf
* Various codepaths that invoked zlib deflate/inflate assumed that these
  functions can compress or uncompress more than 4GB data in one call on
  platforms with 64-bit long, which has been corrected.
* Git now recognizes loose objects written by other implementations that
  use a non-standard window size for zlib deflation (e.g. Agit running on
  Android with 4kb window). We used to reject anything that was not
  deflated with 32kb window.
* Interaction between the use of pager and coloring of the output has
  been improved, especially when a command that is not built-in was
  involved.
* "git am" learned to pass the "--exclude=<path>" option through to underlying
  "git apply".
* You can now feed many empty lines before feeding an mbox file to "git am".
* "git archive" can be told to pass the output to gzip compression and
  produce "archive.tar.gz".
* "git bisect" can be used in a bare repository (provided that the test
  you perform per each iteration does not need a working tree, of course).
* The length of abbreviated object names in "git branch -v" output
  now honors the core.abbrev configuration variable.
* "git check-attr" can take relative paths from the command line.
* "git check-attr" learned an "--all" option to list the attributes for a
  given path.
* "git checkout" (both the code to update the files upon checking out a
  different branch and the code to checkout a specific set of files) learned
  to stream the data from object store when possible, without having to
  read the entire contents of a file into memory first. An earlier round
  of this code that is not in any released version had a large leak but
  now it has been plugged.
* "git clone" can now take a "--config key=value" option to set the
  repository configuration options that affect the initial checkout.
* "git commit <paths>..." now lets you feed relative pathspecs that
  refer to outside your current subdirectory.
* "git diff --stat" learned a --stat-count option to limit the output of
  a diffstat report.
* "git diff" learned a "--histogram" option to use a different diff
  generation machinery stolen from jgit, which might give better performance.
* "git diff" had a weird worst case behaviour that can be triggered
  when comparing files with potentially many places that could match.
* "git fetch", "git push" and friends no longer show connection
  errors for addresses that couldn't be connected to when at least one
  address succeeds (this is arguably a regression but a deliberate one).
* "git grep" learned "--break" and "--heading" options, to let users mimic
  the output format of "ack".
* "git grep" learned a "-W" option that shows wider context using the same
  logic used by "git diff" to determine the hunk header.
* Invoking the low-level "git http-fetch" without "-a" option (which
  git itself never did---normal users should not have to worry about
  this) is now deprecated.
* The "--decorate" option to "git log" and its family learned to
  highlight grafted and replaced commits.
* "git rebase master topci" no longer spews usage hints after giving
  the "fatal: no such branch: topci" error message.
* The recursive merge strategy implementation got a fairly large
  fix for many corner cases that may rarely happen in real world
  projects (it has been verified that none of the 16000+ merges in
  the Linux kernel history back to v2.6.12 is affected with the
  corner case bugs this update fixes).
* "git stash" learned an "--include-untracked option".
* "git submodule update" used to stop at the first error updating a
  submodule; it now goes on to update other submodules that can be
  updated, and reports the ones with errors at the end.
* "git push" can be told with the "--recurse-submodules=check" option to
  refuse pushing of the supermodule, if any of its submodules'
  commits hasn't been pushed out to their remotes.
* "git upload-pack" and "git receive-pack" learned to pretend that only a
  subset of the refs exist in a repository. This may help a site to
  put many tiny repositories into one repository (this would not be
  useful for larger repositories as repacking would be problematic).
* "git verify-pack" has been rewritten to use the "index-pack" machinery
  that is more efficient in reading objects in packfiles.
* test scripts for gitweb tried to run even when CGI-related perl modules
  are not installed; they now exit early when the latter are unavailable.

3 files changed, 21 insertions, 9 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index dd1f2b1db19..5d95e0767d1 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/08/30 09:34:42 adam Exp $
+# $NetBSD: Makefile,v 1.36 2011/10/11 12:01:25 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
@@ -39,7 +39,6 @@ GIT_TEMPLATEDIR=	templates
 
 GIT_TEMPLATES=		description info/exclude
 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
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index b1a62575f1e..1a490f53ed9 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2011/07/08 11:14:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2011/10/11 12:01:25 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -182,11 +182,24 @@ libexec/git-core/git-verify-tag
 libexec/git-core/git-web--browse
 libexec/git-core/git-whatchanged
 libexec/git-core/git-write-tree
+libexec/git-core/mergetools/araxis
+libexec/git-core/mergetools/bc3
+libexec/git-core/mergetools/defaults
+libexec/git-core/mergetools/diffuse
+libexec/git-core/mergetools/ecmerge
+libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/kdiff3
+libexec/git-core/mergetools/kompare
+libexec/git-core/mergetools/meld
+libexec/git-core/mergetools/opendiff
+libexec/git-core/mergetools/p4merge
+libexec/git-core/mergetools/tkdiff
+libexec/git-core/mergetools/tortoisemerge
+libexec/git-core/mergetools/vim
+libexec/git-core/mergetools/xxdiff
 share/examples/scmgit/templates/description
 share/examples/scmgit/templates/hooks/applypatch-msg.sample
 share/examples/scmgit/templates/hooks/commit-msg.sample
-share/examples/scmgit/templates/hooks/post-commit.sample
-share/examples/scmgit/templates/hooks/post-receive.sample
 share/examples/scmgit/templates/hooks/post-update.sample
 share/examples/scmgit/templates/hooks/pre-applypatch.sample
 share/examples/scmgit/templates/hooks/pre-commit.sample
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 5299c0dd796..a6cc0d2f1b1 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2011/09/13 17:58:58 gdt Exp $
+$NetBSD: distinfo,v 1.43 2011/10/11 12:01:25 adam Exp $
 
-SHA1 (git-1.7.6.3.tar.gz) = 7264c0b0d97cb6a70447ba3b4b6fa488810d8115
-RMD160 (git-1.7.6.3.tar.gz) = 8b37b4f83ca2576634a69993060ca2f3993ab689
-Size (git-1.7.6.3.tar.gz) = 3397595 bytes
+SHA1 (git-1.7.7.tar.gz) = bbf85bd767ca6b7e9caa1489bb4ba7ec64e0ab35
+RMD160 (git-1.7.7.tar.gz) = 54a185d66fb1f0e1607dc4514640c4b353d2cd1c
+Size (git-1.7.7.tar.gz) = 3475448 bytes
 SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce