Fri Jul 31 12:57:23 2015 UTC ()
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.


(adam)
diff -r1.27 -r1.28 pkgsrc/devel/git/Makefile.version
diff -r1.9 -r1.10 pkgsrc/devel/git-base/PLIST
diff -r1.31 -r1.32 pkgsrc/devel/git-base/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/git-docs/PLIST
diff -r1.29 -r1.30 pkgsrc/www/gitweb/Makefile

cvs diff -r1.27 -r1.28 pkgsrc/devel/git/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/git/Makefile.version 2015/07/17 11:24:27 1.27
+++ pkgsrc/devel/git/Makefile.version 2015/07/31 12:57:23 1.28
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile.version,v 1.27 2015/07/17 11:24:27 adam Exp $ 1# $NetBSD: Makefile.version,v 1.28 2015/07/31 12:57:23 adam Exp $
2# 2#
3# used by devel/git/Makefile.common 3# used by devel/git/Makefile.common
4# used by devel/git-svn/Makefile 4# used by devel/git-svn/Makefile
5 5
6GIT_VERSION= 2.4.6 6GIT_VERSION= 2.5.0

cvs diff -r1.9 -r1.10 pkgsrc/devel/git-base/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/git-base/PLIST 2015/05/18 12:51:37 1.9
+++ pkgsrc/devel/git-base/PLIST 2015/07/31 12:57:23 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2015/05/18 12:51:37 adam Exp $ 1@comment $NetBSD: PLIST,v 1.10 2015/07/31 12:57:23 adam Exp $
2bin/git 2bin/git
3bin/git-cvsserver 3bin/git-cvsserver
4bin/git-receive-pack 4bin/git-receive-pack
5bin/git-shell 5bin/git-shell
6bin/git-upload-archive 6bin/git-upload-archive
7bin/git-upload-pack 7bin/git-upload-pack
8libexec/git-core/git 8libexec/git-core/git
9libexec/git-core/git-add 9libexec/git-core/git-add
10libexec/git-core/git-add--interactive 10libexec/git-core/git-add--interactive
11libexec/git-core/git-am 11libexec/git-core/git-am
12libexec/git-core/git-annotate 12libexec/git-core/git-annotate
13libexec/git-core/git-apply 13libexec/git-core/git-apply
14libexec/git-core/git-archimport 14libexec/git-core/git-archimport
@@ -155,49 +155,51 @@ libexec/git-core/git-tag @@ -155,49 +155,51 @@ libexec/git-core/git-tag
155libexec/git-core/git-unpack-file 155libexec/git-core/git-unpack-file
156libexec/git-core/git-unpack-objects 156libexec/git-core/git-unpack-objects
157libexec/git-core/git-update-index 157libexec/git-core/git-update-index
158libexec/git-core/git-update-ref 158libexec/git-core/git-update-ref
159libexec/git-core/git-update-server-info 159libexec/git-core/git-update-server-info
160libexec/git-core/git-upload-archive 160libexec/git-core/git-upload-archive
161libexec/git-core/git-upload-pack 161libexec/git-core/git-upload-pack
162libexec/git-core/git-var 162libexec/git-core/git-var
163libexec/git-core/git-verify-commit 163libexec/git-core/git-verify-commit
164libexec/git-core/git-verify-pack 164libexec/git-core/git-verify-pack
165libexec/git-core/git-verify-tag 165libexec/git-core/git-verify-tag
166libexec/git-core/git-web--browse 166libexec/git-core/git-web--browse
167libexec/git-core/git-whatchanged 167libexec/git-core/git-whatchanged
 168libexec/git-core/git-worktree
168libexec/git-core/git-write-tree 169libexec/git-core/git-write-tree
169libexec/git-core/mergetools/araxis 170libexec/git-core/mergetools/araxis
170libexec/git-core/mergetools/bc 171libexec/git-core/mergetools/bc
171libexec/git-core/mergetools/bc3 172libexec/git-core/mergetools/bc3
172libexec/git-core/mergetools/codecompare 173libexec/git-core/mergetools/codecompare
173libexec/git-core/mergetools/deltawalker 174libexec/git-core/mergetools/deltawalker
174libexec/git-core/mergetools/diffmerge 175libexec/git-core/mergetools/diffmerge
175libexec/git-core/mergetools/diffuse 176libexec/git-core/mergetools/diffuse
176libexec/git-core/mergetools/ecmerge 177libexec/git-core/mergetools/ecmerge
177libexec/git-core/mergetools/emerge 178libexec/git-core/mergetools/emerge
178libexec/git-core/mergetools/gvimdiff 179libexec/git-core/mergetools/gvimdiff
179libexec/git-core/mergetools/gvimdiff2 180libexec/git-core/mergetools/gvimdiff2
180libexec/git-core/mergetools/gvimdiff3 181libexec/git-core/mergetools/gvimdiff3
181libexec/git-core/mergetools/kdiff3 182libexec/git-core/mergetools/kdiff3
182libexec/git-core/mergetools/kompare 183libexec/git-core/mergetools/kompare
183libexec/git-core/mergetools/meld 184libexec/git-core/mergetools/meld
184libexec/git-core/mergetools/opendiff 185libexec/git-core/mergetools/opendiff
185libexec/git-core/mergetools/p4merge 186libexec/git-core/mergetools/p4merge
186libexec/git-core/mergetools/tkdiff 187libexec/git-core/mergetools/tkdiff
187libexec/git-core/mergetools/tortoisemerge 188libexec/git-core/mergetools/tortoisemerge
188libexec/git-core/mergetools/vimdiff 189libexec/git-core/mergetools/vimdiff
189libexec/git-core/mergetools/vimdiff2 190libexec/git-core/mergetools/vimdiff2
190libexec/git-core/mergetools/vimdiff3 191libexec/git-core/mergetools/vimdiff3
 192libexec/git-core/mergetools/winmerge
191libexec/git-core/mergetools/xxdiff 193libexec/git-core/mergetools/xxdiff
192share/examples/git/git-completion.bash 194share/examples/git/git-completion.bash
193share/examples/git/git-prompt.sh 195share/examples/git/git-prompt.sh
194share/examples/git/templates/description 196share/examples/git/templates/description
195share/examples/git/templates/hooks/applypatch-msg.sample 197share/examples/git/templates/hooks/applypatch-msg.sample
196share/examples/git/templates/hooks/commit-msg.sample 198share/examples/git/templates/hooks/commit-msg.sample
197share/examples/git/templates/hooks/post-update.sample 199share/examples/git/templates/hooks/post-update.sample
198share/examples/git/templates/hooks/pre-applypatch.sample 200share/examples/git/templates/hooks/pre-applypatch.sample
199share/examples/git/templates/hooks/pre-commit.sample 201share/examples/git/templates/hooks/pre-commit.sample
200share/examples/git/templates/hooks/pre-push.sample 202share/examples/git/templates/hooks/pre-push.sample
201share/examples/git/templates/hooks/pre-rebase.sample 203share/examples/git/templates/hooks/pre-rebase.sample
202share/examples/git/templates/hooks/prepare-commit-msg.sample 204share/examples/git/templates/hooks/prepare-commit-msg.sample
203share/examples/git/templates/hooks/update.sample 205share/examples/git/templates/hooks/update.sample

cvs diff -r1.31 -r1.32 pkgsrc/devel/git-base/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/git-base/distinfo 2015/07/17 11:24:27 1.31
+++ pkgsrc/devel/git-base/distinfo 2015/07/31 12:57:23 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.31 2015/07/17 11:24:27 adam Exp $ 1$NetBSD: distinfo,v 1.32 2015/07/31 12:57:23 adam Exp $
2 2
3SHA1 (git-2.4.6.tar.xz) = 72681005c096d4dbb7b1f6ea4dabfc887522fb00 3SHA1 (git-2.5.0.tar.xz) = c5fbfa92adbb0b0841095c2ada3ccd569ae6700d
4RMD160 (git-2.4.6.tar.xz) = 9389d648c7f875b98d2b5aad946dc4b9df89bfaa 4RMD160 (git-2.5.0.tar.xz) = 7f4932a9af26f9e10c3cffc1d2a4b962b45054a3
5Size (git-2.4.6.tar.xz) = 3690432 bytes 5Size (git-2.5.0.tar.xz) = 3740620 bytes
6SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2 6SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2
7SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba 7SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca 8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
9SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 9SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
13SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 13SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
14SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f 14SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f

cvs diff -r1.4 -r1.5 pkgsrc/devel/git-docs/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/git-docs/PLIST 2014/11/30 18:43:42 1.4
+++ pkgsrc/devel/git-docs/PLIST 2015/07/31 12:57:23 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2014/11/30 18:43:42 adam Exp $ 1@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $
2man/man1/git-add.1 2man/man1/git-add.1
3man/man1/git-am.1 3man/man1/git-am.1
4man/man1/git-annotate.1 4man/man1/git-annotate.1
5man/man1/git-apply.1 5man/man1/git-apply.1
6man/man1/git-archimport.1 6man/man1/git-archimport.1
7man/man1/git-archive.1 7man/man1/git-archive.1
8man/man1/git-bisect.1 8man/man1/git-bisect.1
9man/man1/git-blame.1 9man/man1/git-blame.1
10man/man1/git-branch.1 10man/man1/git-branch.1
11man/man1/git-bundle.1 11man/man1/git-bundle.1
12man/man1/git-cat-file.1 12man/man1/git-cat-file.1
13man/man1/git-check-attr.1 13man/man1/git-check-attr.1
14man/man1/git-check-ignore.1 14man/man1/git-check-ignore.1
@@ -135,26 +135,27 @@ man/man1/git-tag.1 @@ -135,26 +135,27 @@ man/man1/git-tag.1
135man/man1/git-unpack-file.1 135man/man1/git-unpack-file.1
136man/man1/git-unpack-objects.1 136man/man1/git-unpack-objects.1
137man/man1/git-update-index.1 137man/man1/git-update-index.1
138man/man1/git-update-ref.1 138man/man1/git-update-ref.1
139man/man1/git-update-server-info.1 139man/man1/git-update-server-info.1
140man/man1/git-upload-archive.1 140man/man1/git-upload-archive.1
141man/man1/git-upload-pack.1 141man/man1/git-upload-pack.1
142man/man1/git-var.1 142man/man1/git-var.1
143man/man1/git-verify-commit.1 143man/man1/git-verify-commit.1
144man/man1/git-verify-pack.1 144man/man1/git-verify-pack.1
145man/man1/git-verify-tag.1 145man/man1/git-verify-tag.1
146man/man1/git-web--browse.1 146man/man1/git-web--browse.1
147man/man1/git-whatchanged.1 147man/man1/git-whatchanged.1
 148man/man1/git-worktree.1
148man/man1/git-write-tree.1 149man/man1/git-write-tree.1
149man/man1/git.1 150man/man1/git.1
150man/man1/gitk.1 151man/man1/gitk.1
151man/man1/gitremote-helpers.1 152man/man1/gitremote-helpers.1
152man/man1/gitweb.1 153man/man1/gitweb.1
153man/man5/gitattributes.5 154man/man5/gitattributes.5
154man/man5/githooks.5 155man/man5/githooks.5
155man/man5/gitignore.5 156man/man5/gitignore.5
156man/man5/gitmodules.5 157man/man5/gitmodules.5
157man/man5/gitrepository-layout.5 158man/man5/gitrepository-layout.5
158man/man5/gitweb.conf.5 159man/man5/gitweb.conf.5
159man/man7/gitcli.7 160man/man7/gitcli.7
160man/man7/gitcore-tutorial.7 161man/man7/gitcore-tutorial.7

cvs diff -r1.29 -r1.30 pkgsrc/www/gitweb/Makefile (expand / switch to unified diff)

--- pkgsrc/www/gitweb/Makefile 2015/07/19 21:29:44 1.29
+++ pkgsrc/www/gitweb/Makefile 2015/07/31 12:57:23 1.30
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.29 2015/07/19 21:29:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2015/07/31 12:57:23 adam Exp $
2 2
3.include "../../devel/git/Makefile.common" 3.include "../../devel/git/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/git/gitweb/} 5PKGNAME= ${DISTNAME:S/git/gitweb/}
6PKGREVISION= 1 
7CATEGORIES= www 6CATEGORIES= www
8 7
9COMMENT= Web interface for GIT repositories 8COMMENT= Web interface for GIT repositories
10 9
11#DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22 10#DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22
12DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base 11DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base
13#DEPENDS+= {perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes 12#DEPENDS+= {perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes
14DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI 13DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI
15 14
16USE_TOOLS+= perl:run 15USE_TOOLS+= perl:run
17 16
18BUILD_DIRS= gitweb 17BUILD_DIRS= gitweb
19BUILD_TARGET= gitweb.cgi 18BUILD_TARGET= gitweb.cgi