CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 20 20:07:41 UTC 2020

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: Makefile PLIST distinfo
        pkgsrc/devel/git-docs: PLIST
        pkgsrc/devel/git-gitk: PLIST

Log Message:
git: updated to 2.25.0

Git 2.25 Release Notes
======================

Updates since v2.24
-------------------

Backward compatibility notes

UI, Workflows & Features

 * A tutorial on object enumeration has been added.

 * The branch description ("git branch --edit-description") has been
   used to fill the body of the cover letters by the format-patch
   command; this has been enhanced so that the subject can also be
   filled.

 * "git rebase --preserve-merges" has been marked as deprecated; this
   release stops advertising it in the "git rebase -h" output.

 * The code to generate multi-pack index learned to show (or not to
   show) progress indicators.

 * "git apply --3way" learned to honor merge.conflictStyle
   configuration variable, like merges would.

 * The custom format for "git log --format=<format>" learned the l/L
   placeholder that is similar to e/E that fills in the e-mail
   address, but only the local part on the left side of '@'.

 * Documentation pages for "git shortlog" now list commit limiting
   options explicitly.

 * The patterns to detect function boundary for Elixir language has
   been added.

 * The completion script (in contrib/) learned that the "--onto"
   option of "git rebase" can take its argument as the value of the
   option.

 * The userdiff machinery has been taught that "async def" is another
   way to begin a "function" in Python.

 * "git range-diff" learned to take the "--notes=<ref>" and the
   "--no-notes" options to control the commit notes included in the
   log message that gets compared.

 * "git rev-parse --show-toplevel" run outside of any working tree did
   not error out, which has been corrected.

 * A few commands learned to take the pathspec from the standard input
   or a named file, instead of taking it as the command line
   arguments, with the "--pathspec-from-file" option.

 * "git submodule" learned a subcommand "set-url".

 * "git log" family learned "--pretty=reference" that gives the name
   of a commit in the format that is often used to refer to it in log
   messages.

 * The interaction between "git clone --recurse-submodules" and
   alternate object store was ill-designed.  The documentation and
   code have been taught to make more clear recommendations when the
   users see failures.

 * Management of sparsely checked-out working tree has gained a
   dedicated "sparse-checkout" command.

 * Miscellaneous small UX improvements on "git-p4".

 * "git sparse-checkout list" subcommand learned to give its output in
   a more concise form when the "cone" mode is in effect.

Performance, Internal Implementation, Development Support etc.

 * Debugging support for lazy cloning has been a bit improved.

 * Move the definition of a set of bitmask constants from 0ctal
   literal to (1U<<count) notation.

 * Test updates to prepare for SHA-2 transition continues.

 * Crufty code and logic accumulated over time around the object
   parsing and low-level object access used in "git fsck" have been
   cleaned up.

 * The implementation of "git log --graph" got refactored and then its
   output got simplified.

 * Follow recent push to move API docs from Documentation/ to header
   files and update config.h

 * "git bundle" has been taught to use the parse options API.  "git
   bundle verify" learned "--quiet" and "git bundle create" learned
   options to control the progress output.

 * Handling of commit objects that use non UTF-8 encoding during
   "rebase -i" has been improved.

 * The beginning of rewriting "git add -i" in C.

 * A label used in the todo list that are generated by "git rebase
   --rebase-merges" is used as a part of a refname; the logic to come
   up with the label has been tightened to avoid names that cannot be
   used as such.

 * The logic to avoid duplicate label names generated by "git rebase
   --rebase-merges" forgot that the machinery itself uses "onto" as a
   label name, which must be avoided by auto-generated labels, which
   has been corrected.

 * We have had compatibility fallback macro definitions for "PRIuMAX",
   "PRIu32", etc. but did not for "PRIdMAX", while the code used the
   last one apparently without any hiccup reported recently.  The
   fallback macro definitions for these <inttypes.h> macros that must
   appear in C99 systems have been removed.

 * Recently we have declared that GIT_TEST_* variables take the
   usual boolean values (it used to be that some used "non-empty
   means true" and taking GIT_TEST_VAR=YesPlease as true); make
   sure we notice and fail when non-bool strings are given to
   these variables.

 * Users of oneway_merge() (like "reset --hard") learned to take
   advantage of fsmonitor to avoid unnecessary lstat(2) calls.

 * Performance tweak on "git push" into a repository with many refs
   that point at objects we have never heard of.

 * PerfTest fix to avoid stale result mixed up with the latest round
   of test results.

 * Hide lower-level verify_signed-buffer() API as a pure helper to
   implement the public check_signature() function, in order to
   encourage new callers to use the correct and more strict
   validation.

 * Unnecessary reading of state variables back from the disk during
   sequencer operation has been reduced.

 * The code has been made to avoid gmtime() and localtime() and prefer
   their reentrant counterparts.

 * In a repository with many packfiles, the cost of the procedure that
   avoids registering the same packfile twice was unnecessarily high
   by using an inefficient search algorithm, which has been corrected.

 * Redo "git name-rev" to avoid recursive calls.

 * FreeBSD CI support via Cirrus-CI has been added.

Fixes since v2.24
-----------------

 * "rebase -i" ceased to run post-commit hook by mistake in an earlier
   update, which has been corrected.

 * "git notes copy $original" ought to copy the notes attached to the
   original object to HEAD, but a mistaken tightening to command line
   parameter validation made earlier disabled that feature by mistake.

 * When all files from some subdirectory were renamed to the root
   directory, the directory rename heuristics would fail to detect that
   as a rename/merge of the subdirectory to the root directory, which has
   been corrected.

 * Code clean-up and a bugfix in the logic used to tell worktree local
   and repository global refs apart.

 * "git stash save" in a working tree that is sparsely checked out
   mistakenly removed paths that are outside the area of interest.

 * "git rev-parse --git-path HEAD.lock" did not give the right path
   when run in a secondary worktree.

 * "git merge --no-commit" needs "--no-ff" if you do not want to move
   HEAD, which has been corrected in the manual page for "git bisect".

 * "git worktree add" internally calls "reset --hard" that should not
   descend into submodules, even when submodule.recurse configuration
   is set, but it was affected.  This has been corrected.

 * Messages from die() etc. can be mixed up from multiple processes
   without even line buffering on Windows, which has been worked
   around.

 * HTTP transport had possible allocator/deallocator mismatch, which
   has been corrected.

 * The watchman integration for fsmonitor was racy, which has been
   corrected to be more conservative.

 * Fetching from multiple remotes into the same repository in parallel
   had a bad interaction with the recent change to (optionally) update
   the commit-graph after a fetch job finishes, as these parallel
   fetches compete with each other.  Which has been corrected.

 * Recent update to "git stash pop" made the command empty the index
   when run with the "--quiet" option, which has been corrected.

 * "git fetch" codepath had a big "do not lazily fetch missing objects
   when I ask if something exists" switch.  This has been corrected by
   marking the "does this thing exist?" calls with "if not please do not
   lazily fetch it" flag.

 * Test update to avoid wasted cycles.

 * Error handling after "git push" finishes sending the packdata and
   waits for the response to the remote side has been improved.

 * Some codepaths in "gitweb" that forgot to escape URLs generated
   based on end-user input have been corrected.

 * CI jobs for macOS has been made less chatty when updating perforce
   package used during testing.

 * "git unpack-objects" used to show progress based only on the number
   of received and unpacked objects, which stalled when it has to
   handle an unusually large object.  It now shows the throughput as
   well.

 * The sequencer machinery compared the HEAD and the state it is
   attempting to commit to decide if the result would be a no-op
   commit, even when amending a commit, which was incorrect, and
   has been corrected.

 * The code to parse GPG output used to assume incorrectly that the
   finterprint for the primary key would always be present for a valid
   signature, which has been corrected.

 * "git submodule status" and "git submodule status --cached" show
   different things, but the documentation did not cover them
   correctly, which has been corrected.

 * "git reset --patch $object" without any pathspec should allow a
   tree object to be given, but incorrectly required a committish,
   which has been corrected.

 * "git submodule status" that is run from a subdirectory of the
   superproject did not work well, which has been corrected.

 * The revision walking machinery uses resources like per-object flag
   bits that need to be reset before a new iteration of walking
   begins, but the resources related to topological walk were not
   cleared correctly, which has been corrected.

 * TravisCI update.

 * While running "revert" or "cherry-pick --edit" for multiple
   commits, a recent regression incorrectly detected "nothing to
   commit, working tree clean", instead of replaying the commits,
   which has been corrected.

 * Work around a issue where a FD that is left open when spawning a
   child process and is kept open in the child can interfere with the
   operation in the parent process on Windows.

 * One kind of progress messages were always given during commit-graph
   generation, instead of following the "if it takes more than two
   seconds, show progress" pattern, which has been corrected.

 * "git rebase" did not work well when format.useAutoBase
   configuration variable is set, which has been corrected.

 * The "diff" machinery learned not to lose added/removed blank lines
   in the context when --ignore-blank-lines and --function-context are
   used at the same time.

 * The test on "fast-import" used to get stuck when "fast-import" died
   in the middle.

 * "git format-patch" can take a set of configured format.notes values
   to specify which notes refs to use in the log message part of the
   output.  The behaviour of this was not consistent with multiple
   --notes command line options, which has been corrected.

 * "git p4" used to ignore lfs.storage configuration variable, which
   has been corrected.

 * Assorted fixes to the directory traversal API.

 * Forbid pathnames that the platform's filesystem cannot represent on
   MinGW.

 * "git rebase --signoff" stopped working when the command was written
   in C, which has been corrected.

 * An earlier update to Git for Windows declared that a tree object is
   invalid if it has a path component with backslash in it, which was
   overly strict, which has been corrected.  The only protection the
   Windows users need is to prevent such path (or any path that their
   filesystem cannot check out) from entering the index.

 * The code to write split commit-graph file(s) upon fetching computed
   bogus value for the parameter used in splitting the resulting
   files, which has been corrected.

 * Other code cleanup, docfix, build fix, etc.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.93 -r1.94 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/git-docs/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/git-gitk/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.82 pkgsrc/devel/git/Makefile.version:1.83
--- pkgsrc/devel/git/Makefile.version:1.82      Tue Dec 10 18:32:38 2019
+++ pkgsrc/devel/git/Makefile.version   Mon Jan 20 20:07:40 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.82 2019/12/10 18:32:38 leot Exp $
+# $NetBSD: Makefile.version,v 1.83 2020/01/20 20:07:40 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.24.1
+GIT_VERSION=   2.25.0

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.75 pkgsrc/devel/git-base/Makefile:1.76
--- pkgsrc/devel/git-base/Makefile:1.75 Sat Jan 18 21:49:09 2020
+++ pkgsrc/devel/git-base/Makefile      Mon Jan 20 20:07:40 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.75 2020/01/18 21:49:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2020/01/20 20:07:40 adam Exp $
 
-PKGREVISION= 2
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.27 pkgsrc/devel/git-base/PLIST:1.28
--- pkgsrc/devel/git-base/PLIST:1.27    Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/PLIST Mon Jan 20 20:07:40 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2019/11/08 12:24:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/01/20 20:07:40 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -165,6 +165,7 @@ libexec/git-core/git-show
 libexec/git-core/git-show-branch
 libexec/git-core/git-show-index
 libexec/git-core/git-show-ref
+libexec/git-core/git-sparse-checkout
 libexec/git-core/git-stage
 libexec/git-core/git-stash
 libexec/git-core/git-status
@@ -247,3 +248,4 @@ share/locale/ru/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo
 share/locale/vi/LC_MESSAGES/git.mo
 share/locale/zh_CN/LC_MESSAGES/git.mo
+share/locale/zh_TW/LC_MESSAGES/git.mo

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.93 pkgsrc/devel/git-base/distinfo:1.94
--- pkgsrc/devel/git-base/distinfo:1.93 Tue Dec 10 18:32:38 2019
+++ pkgsrc/devel/git-base/distinfo      Mon Jan 20 20:07:40 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.93 2019/12/10 18:32:38 leot Exp $
+$NetBSD: distinfo,v 1.94 2020/01/20 20:07:40 adam Exp $
 
-SHA1 (git-2.24.1.tar.xz) = 4b7f157c30f2929bb8862e991ec9a539d3a6651b
-RMD160 (git-2.24.1.tar.xz) = 7e2f48ce850b1ee4d3dd459e08b28db15d87537a
-SHA512 (git-2.24.1.tar.xz) = 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-Size (git-2.24.1.tar.xz) = 5772304 bytes
+SHA1 (git-2.25.0.tar.xz) = 6ea4b553fbdd9112777902f2f6754439bdc20167
+RMD160 (git-2.25.0.tar.xz) = 82e6c2f9d06cd9a5a45859db173a690729ef252f
+SHA512 (git-2.25.0.tar.xz) = 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191
+Size (git-2.25.0.tar.xz) = 5873532 bytes
 SHA1 (patch-Documentation_Makefile) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
 SHA1 (patch-builtin_receive-pack.c) = 271df08d874a11b41f33aade64352040bc028fa2

Index: pkgsrc/devel/git-docs/PLIST
diff -u pkgsrc/devel/git-docs/PLIST:1.13 pkgsrc/devel/git-docs/PLIST:1.14
--- pkgsrc/devel/git-docs/PLIST:1.13    Tue Aug 20 13:00:02 2019
+++ pkgsrc/devel/git-docs/PLIST Mon Jan 20 20:07:40 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/08/20 13:00:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/01/20 20:07:40 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -126,6 +126,7 @@ man/man1/git-show-branch.1
 man/man1/git-show-index.1
 man/man1/git-show-ref.1
 man/man1/git-show.1
+man/man1/git-sparse-checkout.1
 man/man1/git-stage.1
 man/man1/git-stash.1
 man/man1/git-status.1

Index: pkgsrc/devel/git-gitk/PLIST
diff -u pkgsrc/devel/git-gitk/PLIST:1.9 pkgsrc/devel/git-gitk/PLIST:1.10
--- pkgsrc/devel/git-gitk/PLIST:1.9     Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-gitk/PLIST Mon Jan 20 20:07:41 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/11/08 12:24:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/01/20 20:07:41 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -15,6 +15,7 @@ share/git-gui/lib/checkout_op.tcl
 share/git-gui/lib/choose_font.tcl
 share/git-gui/lib/choose_repository.tcl
 share/git-gui/lib/choose_rev.tcl
+share/git-gui/lib/chord.tcl
 share/git-gui/lib/class.tcl
 share/git-gui/lib/commit.tcl
 share/git-gui/lib/console.tcl