Changes 1.7.5:

* Various MinGW portability fixes.
* Various git-p4 enhancements (in contrib).
* Various vcs-svn, git-svn and gitk enhancements and fixes.
* Various git-gui updates (0.14.0).
* Update to more modern HP-UX port.
* The codebase is getting prepared for i18n/l10n; no translated
  strings nor translation mechanism in the code yet, but the strings
  are being marked for l10n.
* The bash completion script can now complete symmetric difference
  for "git diff" command, e.g. "git diff ...bra<TAB>".
* The default minimum length of abbreviated and unique object names
  can now be configured by setting the core.abbrev configuration
  variable.
* "git apply -v" reports offset lines when the patch does not apply at
  the exact location recorded in the diff output.
* "git config" used to be also known as "git repo-config", but the old
  name is now officially deprecated.
* "git checkout --detach <commit>" is a more user friendly synonym for
  "git checkout <commit>^0".
* "git checkout" performed on detached HEAD gives a warning and
  advice when the commit being left behind will become unreachable from
  any branch or tag.
* "git cherry-pick" and "git revert" can be told to use a custom merge
  strategy, similar to "git rebase".
* "git cherry-pick" remembers which commit failed to apply when it is
  stopped by conflicts, making it unnecessary to use "commit -c $commit"
  to conclude it.
* "git cvsimport" bails out immediately when the cvs server cannot be
  reached, without spewing unnecessary error messages that complain about
  the server response it never got.
* "git fetch" vs "git upload-pack" transfer learned 'no-done'
  protocol extension to save one round-trip after the content
  negotiation is done. This saves one HTTP RPC, reducing the overall
  latency for a trivial fetch.
* "git fetch" can be told to recursively fetch submodules on-demand.
* "git grep -f <filename>" learned to treat "-" as "read from the
  standard input stream".
* "git grep --no-index" did not honor pathspecs correctly, returning
  paths outside the specified area.
* "git init" learned the --separate-git-dir option to allow the git
  directory for a new repository created elsewhere and linked via the
  gitdir mechanism. This is primarily to help submodule support later
  to switch between a branch of superproject that has the submodule
  and another that does not.
* "git log" type commands now understand globbing pathspecs.  You
  can say "git log -- '*.txt'" for example.
* "git log" family of commands learned --cherry and --cherry-mark
  options that can be used to view two diverged branches while omitting
  or highlighting equivalent changes that appear on both sides of a
  symmetric difference (e.g. "log --cherry A...B").
* A lazy "git merge" that didn't say what to merge used to be an error.
  When run on a branch that has an upstream defined, however, the command
  now merges from the configured upstream.
* "git mergetool" learned how to drive "beyond compare 3" as well.
* "git rerere forget" without pathspec used to forget all the saved
  conflicts that relate to the current merge; it now requires you to
  give it pathspecs.
* "git rev-list --objects $revs -- $pathspec" now limits the objects listed
  in its output properly with the pathspec, in preparation for narrow
  clones.
* "git push" with no parameters gives better advice messages when
  "tracking" is used as the push.default semantics or there is no remote
  configured yet.
* A possible value to the "push.default" configuration variable,
  'tracking', gained a synonym that more naturally describes what it
  does, 'upstream'.
* "git rerere" learned a new subcommand "remaining" that is similar to
  "status" and lists the paths that had conflicts which are known to
  rerere, but excludes the paths that have already been marked as
  resolved in the index from its output.  "git mergetool" has been
  updated to use this facility.

4 files changed, 10 insertions, 10 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 7202a701cff..dc3796d5a43 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2011/04/22 13:43:23 obache Exp $
+# $NetBSD: Makefile,v 1.33 2011/04/26 10:57:20 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=	scmgit-base-${GIT_VERSION}
-PKGREVISION=	2
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -90,7 +89,7 @@ SUBST_SED.fix-cd-P=	-e "s/cd -P/cd/g"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
-.include "../../textproc/expat/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 54294d66a69..c8314cdfdd5 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/03/11 09:28:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/04/26 10:57:20 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -255,6 +255,7 @@ ${PLIST.gui}share/gitk/lib/msgs/ja.msg
 ${PLIST.gui}share/gitk/lib/msgs/pt_br.msg
 ${PLIST.gui}share/gitk/lib/msgs/ru.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
+share/git-gui/lib/msgs/pt_br.msg
 share/gitweb/gitweb.cgi
 share/gitweb/static/git-favicon.png
 share/gitweb/static/git-logo.png
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 95a9a845747..8b6cd885412 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2011/04/08 07:28:40 adam Exp $
+$NetBSD: distinfo,v 1.35 2011/04/26 10:57:20 adam Exp $
 
-SHA1 (git-1.7.4.4.tar.bz2) = 0c5d6b06cfbe73eb60ce7a59b9eec5fb9c6dc034
-RMD160 (git-1.7.4.4.tar.bz2) = 047ad2cb600e31e89133fbd44fbfa16ee42e5fc1
-Size (git-1.7.4.4.tar.bz2) = 2709587 bytes
+SHA1 (git-1.7.5.tar.bz2) = bbea4a50fe57aad1d0e69550bac628e1b18abbdc
+RMD160 (git-1.7.5.tar.bz2) = 42e0163365d89054cf865291aa35b0c2a9f1e0b2
+Size (git-1.7.5.tar.bz2) = 2753821 bytes
 SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index a3f63e0b39e..ff86a151288 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.21 2011/04/08 07:28:39 adam Exp $
+# $NetBSD: Makefile.version,v 1.22 2011/04/26 10:57:20 adam Exp $
 
-GIT_VERSION=	1.7.4.4
+GIT_VERSION=	1.7.5