From c8a98d8827679865d6e5d3bb8ebb68336c8e4cfe Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 30 Aug 2015 16:08:06 +0000 Subject: [PATCH] Update to 2.5.1: Git v2.5.1 Release Notes ======================== Fixes since v2.5 ---------------- * Running an aliased command from a subdirectory when the .git thing in the working tree is a gitfile pointing elsewhere did not work. * Often a fast-import stream builds a new commit on top of the previous commit it built, and it often unconditionally emits a "from" command to specify the first parent, which can be omitted in such a case. This caused fast-import to forget the tree of the previous commit and then re-read it from scratch, which was inefficient. Optimize for this common case. * The "rev-parse --parseopt" mode parsed the option specification and the argument hint in a strange way to allow '=' and other special characters in the option name while forbidding them from the argument hint. This made it impossible to define an option like "--pair =" with "pair=key=value" specification, which instead would have defined a "--pair=key " option. * A "rebase" replays changes of the local branch on top of something else, as such they are placed in stage #3 and referred to as "theirs", while the changes in the new base, typically a foreign work, are placed in stage #2 and referred to as "ours". Clarify the "checkout --ours/--theirs". * An experimental "untracked cache" feature used uname(2) in a slightly unportable way. * "sparse checkout" misbehaved for a path that is excluded from the checkout when switching between branches that differ at the path. * The low-level "git send-pack" did not honor 'user.signingkey' configuration variable when sending a signed-push. * An attempt to delete a ref by pushing into a repository whose HEAD symbolic reference points at an unborn branch that cannot be created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD points at refs/heads/a) failed. * "git subtree" (in contrib/) depended on "git log" output to be stable, which was a no-no. Apply a workaround to force a particular date format. * "git clone $URL" in recent releases of Git contains a regression in the code that invents a new repository name incorrectly based on the $URL. This has been corrected. (merge db2e220 jk/guess-repo-name-regression-fix later to maint). * Running tests with the "-x" option to make them verbose had some unpleasant interactions with other features of the test suite. (merge 9b5fe78 jk/test-with-x later to maint). * "git pull" in recent releases of Git has a regression in the code that allows custom path to the --upload-pack=. This has been corrected. * pipe() emulation used in Git for Windows looked at a wrong variable when checking for an error from an _open_osfhandle() call. Also contains typofixes, documentation updates and trivial code clean-ups. --- devel/git-base/distinfo | 8 ++++---- devel/git/Makefile.version | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index a5bbd3deccdbe..c421e7ba73e7a 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.32 2015/07/31 12:57:23 adam Exp $ +$NetBSD: distinfo,v 1.33 2015/08/30 16:08:06 wiz Exp $ -SHA1 (git-2.5.0.tar.xz) = c5fbfa92adbb0b0841095c2ada3ccd569ae6700d -RMD160 (git-2.5.0.tar.xz) = 7f4932a9af26f9e10c3cffc1d2a4b962b45054a3 -Size (git-2.5.0.tar.xz) = 3740620 bytes +SHA1 (git-2.5.1.tar.xz) = 809baa9b2e71fed78d78aa734d19bd940f85867c +RMD160 (git-2.5.1.tar.xz) = 02b46b41c0f7db18f804048b858030041f421282 +Size (git-2.5.1.tar.xz) = 3741764 bytes SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 6d670c26fdb9e..790864252c659 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.28 2015/07/31 12:57:23 adam Exp $ +# $NetBSD: Makefile.version,v 1.29 2015/08/30 16:08:06 wiz Exp $ # # used by devel/git/Makefile.common # used by devel/git-svn/Makefile -GIT_VERSION= 2.5.0 +GIT_VERSION= 2.5.1