diff options
author | wiz <wiz@pkgsrc.org> | 2015-08-30 16:08:06 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-08-30 16:08:06 +0000 |
commit | 8c6ef5b1bb1cd1c4dbb486edec924e3d318ef500 (patch) | |
tree | 69e40b2f1dd8c6114be56426e85831b10a07b098 /devel/git | |
parent | b8102efacfc2fd15e9f4bfaf98f330e5fc74ecc1 (diff) | |
download | pkgsrc-8c6ef5b1bb1cd1c4dbb486edec924e3d318ef500.tar.gz |
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 <key>=<value>" with "pair=key=value" specification,
which instead would have defined a "--pair=key <value>" 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=<program>. 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.
Diffstat (limited to 'devel/git')
-rw-r--r-- | devel/git/Makefile.version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 6d670c26fdb..790864252c6 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 |