Changes 1.8.5:

Foreign interfaces, subsystems and ports.

 * The HTTP transport, when talking GSS-Negotiate, uses "100
   Continue" response to avoid having to rewind and resend a large
   payload, which may not be always doable.

 * Various bugfixes to remote-bzr and remote-hg (in contrib/).

 * The build procedure is aware of MirBSD now.

 * Various "git p4", "git svn" and "gitk" updates.


UI, Workflows & Features

 * Fetching from a shallowly-cloned repository used to be forbidden,
   primarily because the codepaths involved were not carefully vetted
   and we did not bother supporting such usage. This release attempts
   to allow object transfer out of a shallowly-cloned repository in a
   more controlled way (i.e. the receiver becomes a shallow repository
   with a truncated history).

 * Just like we give a reasonable default for "less" via the LESS
   environment variable, we now specify a reasonable default for "lv"
   via the "LV" environment variable when spawning the pager.

 * Two-level configuration variable names in "branch.*" and "remote.*"
   hierarchies, whose variables are predominantly three-level, were
   not completed by hitting a <TAB> in bash and zsh completions.

 * Fetching a 'frotz' branch with "git fetch", while a 'frotz/nitfol'
   remote-tracking branch from an earlier fetch was still there, would
   error out, primarily because the command was not told that it is
   allowed to lose any information on our side.  "git fetch --prune"
   now can be used to remove 'frotz/nitfol' to make room for fetching and
   storing the 'frotz' remote-tracking branch.

 * "diff.orderfile=<file>" configuration variable can be used to
   pretend as if the "-O<file>" option were given from the command
   line of "git diff", etc.

 * The negative pathspec syntax allows "git log -- . ':!dir'" to tell
   us "I am interested in everything but 'dir' directory".

 * "git difftool" shows how many different paths there are in total,
   and how many of them have been shown so far, to indicate progress.

 * "git push origin master" used to push our 'master' branch to update
   the 'master' branch at the 'origin' repository.  This has been
   enhanced to use the same ref mapping "git push origin" would use to
   determine what ref at the 'origin' to be updated with our 'master'.
   For example, with this configuration

   [remote "origin"]
      push = refs/heads/*:refs/review/*

   that would cause "git push origin" to push out our local branches
   to corresponding refs under refs/review/ hierarchy at 'origin',
   "git push origin master" would update 'refs/review/master' over
   there.  Alternatively, if push.default is set to 'upstream' and our
   'master' is set to integrate with 'topic' from the 'origin' branch,
   running "git push origin" while on our 'master' would update their
   'topic' branch, and running "git push origin master" while on any
   of our branches does the same.

 * "gitweb" learned to treat ref hierarchies other than refs/heads as
   if they are additional branch namespaces (e.g. refs/changes/ in
   Gerrit).

 * "git for-each-ref --format=..." learned a few formatting directives;
   e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)".

 * The command string given to "git submodule foreach" is passed
   directly to the shell, without being eval'ed.  This is a backward
   incompatible change that may break existing users.

 * "git log" and friends learned the "--exclude=<glob>" option, to
   allow people to say "list history of all branches except those that
   match this pattern" with "git log --exclude='*/*' --branches".

 * "git rev-parse --parseopt" learned a new "--stuck-long" option to
   help scripts parse options with an optional parameter.

 * The "--tags" option to "git fetch" no longer tells the command to
   fetch _only_ the tags. It instead fetches tags _in addition to_
   what are fetched by the same command line without the option.

8 files changed, 15 insertions, 53 deletions

diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 7eebf3707a6..c98fdb746b7 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/02/12 23:17:46 tron Exp $
+# $NetBSD: Makefile,v 1.11 2014/02/23 10:00:27 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=	git-base-${GIT_VERSION}
-PKGREVISION=	1
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=		scmgit-base-[0-9]*
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index 823c5717a55..b0ae2ff3e15 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/01/03 17:31:25 richard Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/02/23 10:00:27 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -95,7 +95,6 @@ libexec/git-core/git-init
 libexec/git-core/git-init-db
 libexec/git-core/git-instaweb
 libexec/git-core/git-log
-libexec/git-core/git-lost-found
 libexec/git-core/git-ls-files
 libexec/git-core/git-ls-remote
 libexec/git-core/git-ls-tree
@@ -125,7 +124,6 @@ libexec/git-core/git-pack-redundant
 libexec/git-core/git-pack-refs
 libexec/git-core/git-parse-remote
 libexec/git-core/git-patch-id
-libexec/git-core/git-peek-remote
 libexec/git-core/git-prune
 libexec/git-core/git-prune-packed
 libexec/git-core/git-pull
@@ -149,7 +147,6 @@ libexec/git-core/git-remote-https
 libexec/git-core/git-remote-testsvn
 libexec/git-core/git-repack
 libexec/git-core/git-replace
-libexec/git-core/git-repo-config
 libexec/git-core/git-request-pull
 libexec/git-core/git-rerere
 libexec/git-core/git-reset
@@ -176,7 +173,6 @@ libexec/git-core/git-submodule
 libexec/git-core/git-svn
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
-libexec/git-core/git-tar-tree
 libexec/git-core/git-unpack-file
 libexec/git-core/git-unpack-objects
 libexec/git-core/git-update-index
@@ -223,12 +219,11 @@ share/examples/git/templates/hooks/pre-rebase.sample
 share/examples/git/templates/hooks/prepare-commit-msg.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude
-share/locale/da/LC_MESSAGES/git.mo
+share/locale/bg/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
-share/locale/nl/LC_MESSAGES/git.mo
 share/locale/pt_PT/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo
 share/locale/vi/LC_MESSAGES/git.mo
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index b33b44b6bf2..598bd7f6d6b 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2014/02/06 17:34:02 adam Exp $
+$NetBSD: distinfo,v 1.12 2014/02/23 10:00:27 adam Exp $
 
-SHA1 (git-1.8.5.4.tar.gz) = cbf14318ee9652232489982bb2da15d2e5ebb580
-RMD160 (git-1.8.5.4.tar.gz) = 9bf3c366ad95f069997eb70633a7d977b879e5dc
-Size (git-1.8.5.4.tar.gz) = 4760610 bytes
+SHA1 (git-1.9.0.tar.gz) = e60667fc16e5a5f1cde46616b0458cc802707743
+RMD160 (git-1.9.0.tar.gz) = bc8d4046749bf256494d6fc8f3a92e9c4d57aba6
+Size (git-1.9.0.tar.gz) = 4839724 bytes
 SHA1 (patch-aa) = 31f3759c6cf3bfd28d154b3abaa95d396b72502b
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
@@ -10,6 +10,5 @@ SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
-SHA1 (patch-config.mak.uname) = 6321f0e0d941d04fdd378b2341c2ba1c938441a3
-SHA1 (patch-git-compat-util.h) = 788800c9972faadef40ad7ef795ed72305bfa292
+SHA1 (patch-config.mak.uname) = f18aafb64828f3c3e49321d6ef9756fff42c2056
 SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc
diff --git a/devel/git-base/patches/patch-config.mak.uname b/devel/git-base/patches/patch-config.mak.uname
index 9b0af08c3cc..d53e08bbb2b 100644
--- a/devel/git-base/patches/patch-config.mak.uname
+++ b/devel/git-base/patches/patch-config.mak.uname
@@ -1,4 +1,4 @@
-$NetBSD: patch-config.mak.uname,v 1.2 2014/01/01 16:05:51 bsiegert Exp $
+$NetBSD: patch-config.mak.uname,v 1.3 2014/02/23 10:00:27 adam Exp $
 
 --- config.mak.uname.orig	Tue Dec  3 19:34:59 2013
 +++ config.mak.uname
@@ -20,17 +20,3 @@ $NetBSD: patch-config.mak.uname,v 1.2 2014/01/01 16:05:51 bsiegert Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -196,6 +194,13 @@ ifeq ($(uname_S),OpenBSD)
- 	NEEDS_LIBICONV = YesPlease
- 	BASIC_CFLAGS += -I/usr/local/include
- 	BASIC_LDFLAGS += -L/usr/local/lib
-+	HAVE_PATHS_H = YesPlease
-+endif
-+ifeq ($(uname_S),MirBSD)
-+	NO_STRCASESTR = YesPlease
-+	NO_MEMMEM = YesPlease
-+	USE_ST_TIMESPEC = YesPlease
-+	NEEDS_LIBICONV = YesPlease
- 	HAVE_PATHS_H = YesPlease
- endif
- ifeq ($(uname_S),NetBSD)
diff --git a/devel/git-base/patches/patch-git-compat-util.h b/devel/git-base/patches/patch-git-compat-util.h
deleted file mode 100644
index 65f0740f9b3..00000000000
--- a/devel/git-base/patches/patch-git-compat-util.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-git-compat-util.h,v 1.1 2014/01/01 16:05:51 bsiegert Exp $
-
-MirBSD does not define u_short and u_long when _XOPEN_SOURCE is defined.
-
---- git-compat-util.h.orig	Tue Dec  3 19:34:59 2013
-+++ git-compat-util.h
-@@ -75,7 +75,7 @@
- # endif
- #elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
-       !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \
--      !defined(__TANDEM) && !defined(__QNX__)
-+      !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__)
- #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/git-docs/PLIST b/devel/git-docs/PLIST
index 2df8f947660..19363852950 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/09 13:55:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/02/23 10:00:27 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -65,7 +65,6 @@ man/man1/git-init-db.1
 man/man1/git-init.1
 man/man1/git-instaweb.1
 man/man1/git-log.1
-man/man1/git-lost-found.1
 man/man1/git-ls-files.1
 man/man1/git-ls-remote.1
 man/man1/git-ls-tree.1
@@ -90,7 +89,6 @@ man/man1/git-pack-redundant.1
 man/man1/git-pack-refs.1
 man/man1/git-parse-remote.1
 man/man1/git-patch-id.1
-man/man1/git-peek-remote.1
 man/man1/git-prune-packed.1
 man/man1/git-prune.1
 man/man1/git-pull.1
@@ -107,7 +105,6 @@ man/man1/git-remote-testgit.1
 man/man1/git-remote.1
 man/man1/git-repack.1
 man/man1/git-replace.1
-man/man1/git-repo-config.1
 man/man1/git-request-pull.1
 man/man1/git-rerere.1
 man/man1/git-reset.1
@@ -134,7 +131,6 @@ man/man1/git-submodule.1
 man/man1/git-svn.1
 man/man1/git-symbolic-ref.1
 man/man1/git-tag.1
-man/man1/git-tar-tree.1
 man/man1/git-unpack-file.1
 man/man1/git-unpack-objects.1
 man/man1/git-update-index.1
diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST
index 5fcdb9d0c5f..75f35d13bee 100644
--- a/devel/git-gitk/PLIST
+++ b/devel/git-gitk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/09 13:55:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/02/23 10:00:27 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -34,6 +34,7 @@ share/git-gui/lib/line.tcl
 share/git-gui/lib/logo.tcl
 share/git-gui/lib/merge.tcl
 share/git-gui/lib/mergetool.tcl
+share/git-gui/lib/msgs/bg.msg
 share/git-gui/lib/msgs/de.msg
 share/git-gui/lib/msgs/el.msg
 share/git-gui/lib/msgs/fr.msg
@@ -61,6 +62,7 @@ share/git-gui/lib/tools_dlg.tcl
 share/git-gui/lib/transport.tcl
 share/git-gui/lib/win32.tcl
 share/git-gui/lib/win32_shortcut.js
+share/gitk/lib/msgs/bg.msg
 share/gitk/lib/msgs/de.msg
 share/gitk/lib/msgs/es.msg
 share/gitk/lib/msgs/fr.msg
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 1eae4beccc3..3c079429f71 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.9 2014/02/06 17:34:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.10 2014/02/23 10:00:27 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-svn/Makefile
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.8.5.4
+GIT_VERSION=	1.9.0