diff options
author | adam <adam> | 2015-07-31 12:57:23 +0000 |
---|---|---|
committer | adam <adam> | 2015-07-31 12:57:23 +0000 |
commit | 8f61a2d3b2d05979a1c89cc2ea2e18c819037b80 (patch) | |
tree | 7a1f853dbe479c1d3a3d6e0e5b6552a69384511d | |
parent | b3685593111c15157d9b7d8addb8885ab4fee1b8 (diff) | |
download | pkgsrc-8f61a2d3b2d05979a1c89cc2ea2e18c819037b80.tar.gz |
Changes 2.5.0:
UI, Workflows & Features
* The bash completion script (in contrib/) learned a few options that
"git revert" takes.
* Whitespace breakages in deleted and context lines can also be
painted in the output of "git diff" and friends with the new
--ws-error-highlight option.
* List of commands shown by "git help" are grouped along the workflow
elements to help early learners.
* "git p4" now detects the filetype (e.g. binary) correctly even when
the files are opened exclusively.
* git p4 attempts to better handle branches in Perforce.
* "git p4" learned "--changes-block-size <n>" to read the changes in
chunks from Perforce, instead of making one call to "p4 changes"
that may trigger "too many rows scanned" error from Perforce.
* More workaround for Perforce's row number limit in "git p4".
* Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the
command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'
did not let the shell interpolate the contents of the environment
variable that name the editor "$P4EDITOR" (and "$EDITOR", too).
This release makes it in line with the rest of Git, as well as with
Perforce.
* A new short-hand <branch>@{push} denotes the remote-tracking branch
that tracks the branch at the remote the <branch> would be pushed
to.
* "git show-branch --topics HEAD" (with no other arguments) did not
do anything interesting. Instead, contrast the given revision
against all the local branches by default.
* A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
Consider this as still an experimental feature; its UI is still
likely to change.
* Tweak the sample "store" backend of the credential helper to honor
XDG configuration file locations when specified.
* A heuristic we use to catch mistyped paths on the command line
"git <cmd> <revs> <pathspec>" is to make sure that all the non-rev
parameters in the later part of the command line are names of the
files in the working tree, but that means "git grep $str -- \*.c"
must always be disambiguated with "--", because nobody sane will
create a file whose name literally is asterisk-dot-see. Loosen the
heuristic to declare that with a wildcard string the user likely
meant to give us a pathspec.
* "git merge FETCH_HEAD" learned that the previous "git fetch" could
be to create an Octopus merge, i.e. recording multiple branches
that are not marked as "not-for-merge"; this allows us to lose an
old style invocation "git merge <msg> HEAD $commits..." in the
implementation of "git pull" script; the old style syntax can now
be deprecated (but not removed yet).
* Filter scripts were run with SIGPIPE disabled on the Git side,
expecting that they may not read what Git feeds them to filter.
We however treated a filter that does not read its input fully
before exiting as an error. We no longer do and ignore EPIPE
when writing to feed the filter scripts.
This changes semantics, but arguably in a good way. If a filter
can produce its output without fully consuming its input using
whatever magic, we now let it do so, instead of diagnosing it
as a programming error.
* Instead of dying immediately upon failing to obtain a lock, the
locking (of refs etc) retries after a short while with backoff.
* Introduce http.<url>.SSLCipherList configuration variable to tweak
the list of cipher suite to be used with libcURL when talking with
https:// sites.
* "git subtree" script (in contrib/) used "echo -n" to produce
progress messages in a non-portable way.
* "git subtree" script (in contrib/) does not have --squash option
when pushing, but the documentation and help text pretended as if
it did.
* The Git subcommand completion (in contrib/) no longer lists credential
helpers among candidates; they are not something the end user would
invoke interactively.
* The index file can be taught with "update-index --untracked-cache"
to optionally remember already seen untracked files, in order to
speed up "git status" in a working tree with tons of cruft.
* "git mergetool" learned to drive WinMerge as a backend.
* "git upload-pack" that serves "git fetch" can be told to serve
commits that are not at the tip of any ref, as long as they are
reachable from a ref, with uploadpack.allowReachableSHA1InWant
configuration variable.
-rw-r--r-- | devel/git-base/PLIST | 4 | ||||
-rw-r--r-- | devel/git-base/distinfo | 8 | ||||
-rw-r--r-- | devel/git-docs/PLIST | 3 | ||||
-rw-r--r-- | devel/git/Makefile.version | 4 | ||||
-rw-r--r-- | www/gitweb/Makefile | 3 |
5 files changed, 12 insertions, 10 deletions
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST index d2f71c1eac5..f3380e408e4 100644 --- a/devel/git-base/PLIST +++ b/devel/git-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2015/05/18 12:51:37 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2015/07/31 12:57:23 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -165,6 +165,7 @@ libexec/git-core/git-verify-pack libexec/git-core/git-verify-tag libexec/git-core/git-web--browse libexec/git-core/git-whatchanged +libexec/git-core/git-worktree libexec/git-core/git-write-tree libexec/git-core/mergetools/araxis libexec/git-core/mergetools/bc @@ -188,6 +189,7 @@ libexec/git-core/mergetools/tortoisemerge libexec/git-core/mergetools/vimdiff libexec/git-core/mergetools/vimdiff2 libexec/git-core/mergetools/vimdiff3 +libexec/git-core/mergetools/winmerge libexec/git-core/mergetools/xxdiff share/examples/git/git-completion.bash share/examples/git/git-prompt.sh diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index e4fc4467ff5..a5bbd3deccd 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.31 2015/07/17 11:24:27 adam Exp $ +$NetBSD: distinfo,v 1.32 2015/07/31 12:57:23 adam Exp $ -SHA1 (git-2.4.6.tar.xz) = 72681005c096d4dbb7b1f6ea4dabfc887522fb00 -RMD160 (git-2.4.6.tar.xz) = 9389d648c7f875b98d2b5aad946dc4b9df89bfaa -Size (git-2.4.6.tar.xz) = 3690432 bytes +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 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST index 0b3aaf4d4a2..4782b72034f 100644 --- a/devel/git-docs/PLIST +++ b/devel/git-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/11/30 18:43:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -145,6 +145,7 @@ man/man1/git-verify-pack.1 man/man1/git-verify-tag.1 man/man1/git-web--browse.1 man/man1/git-whatchanged.1 +man/man1/git-worktree.1 man/man1/git-write-tree.1 man/man1/git.1 man/man1/gitk.1 diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index eab211a743a..6d670c26fdb 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.27 2015/07/17 11:24:27 adam Exp $ +# $NetBSD: Makefile.version,v 1.28 2015/07/31 12:57:23 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-svn/Makefile -GIT_VERSION= 2.4.6 +GIT_VERSION= 2.5.0 diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index 35110b1d840..06c40048636 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2015/07/19 21:29:44 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2015/07/31 12:57:23 adam Exp $ .include "../../devel/git/Makefile.common" PKGNAME= ${DISTNAME:S/git/gitweb/} -PKGREVISION= 1 CATEGORIES= www COMMENT= Web interface for GIT repositories |