CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 20 13:00:02 UTC 2019

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

Log Message:
git: updated to 2.23.0

Git 2.23 Release Notes
======================

Updates since v2.22
-------------------

Backward compatibility note

 * The "--base" option of "format-patch" computed the patch-ids for
   prerequisite patches in an unstable way, which has been updated to
   compute in a way that is compatible with "git patch-id --stable".

 * The "git log" command by default behaves as if the --mailmap option
   was given.

UI, Workflows & Features

 * The "git fast-export/import" pair has been taught to handle commits
   with log messages in encoding other than UTF-8 better.

 * In recent versions of Git, per-worktree refs are exposed in
   refs/worktrees/<wtname>/ hierarchy, which means that worktree names
   must be a valid refname component.  The code now sanitizes the names
   given to worktrees, to make sure these refs are well-formed.

 * "git merge" learned "--quit" option that cleans up the in-progress
   merge while leaving the working tree and the index still in a mess.

 * "git format-patch" learns a configuration to set the default for
   its --notes=<ref> option.

 * The code to show args with potential typo that cannot be
   interpreted as a commit-ish has been improved.

 * "git clone --recurse-submodules" learned to set up the submodules
   to ignore commit object names recorded in the superproject gitlink
   and instead use the commits that happen to be at the tip of the
   remote-tracking branches from the get-go, by passing the new
   "--remote-submodules" option.

 * The pattern "git diff/grep" use to extract funcname and words
   boundary for Matlab has been extend to cover Octave, which is more
   or less equivalent.

 * "git help git" was hard to discover (well, at least for some
   people).

 * The pattern "git diff/grep" use to extract funcname and words
   boundary for Rust has been added.

 * "git status" can be told a non-standard default value for the
   "--[no-]ahead-behind" option with a new configuration variable
   status.aheadBehind.

 * "git fetch" and "git pull" reports when a fetch results in
   non-fast-forward updates to let the user notice unusual situation.
   The commands learned "--no-show-forced-updates" option to disable
   this safety feature.

 * Two new commands "git switch" and "git restore" are introduced to
   split "checking out a branch to work on advancing its history" and
   "checking out paths out of the index and/or a tree-ish to work on
   advancing the current history" out of the single "git checkout"
   command.

 * "git branch --list" learned to always output the detached HEAD as
   the first item (when the HEAD is detached, of course), regardless
   of the locale.

 * The conditional inclusion mechanism learned to base the choice on
   the branch the HEAD currently is on.

 * "git rev-list --objects" learned the "--no-object-names" option to
   squelch the path to the object that is used as a grouping hint for
   pack-objects.

 * A new tag.gpgSign configuration variable turns "git tag -a" into
   "git tag -s".

 * "git multi-pack-index" learned expire and repack subcommands.

 * "git blame" learned to "ignore" commits in the history, whose
   effects (as well as their presence) get ignored.

 * "git cherry-pick/revert" learned a new "--skip" action.

 * The tips of refs from the alternate object store can be used as
   starting point for reachability computation now.

 * Extra blank lines in "git status" output have been reduced.

 * The commits in a repository can be described by multiple
   commit-graph files now, which allows the commit-graph files to be
   updated incrementally.

 * "git range-diff" output has been tweaked for easier identification
   of which part of what file the patch shown is about.

Performance, Internal Implementation, Development Support etc.

 * Update supporting parts of "git rebase" to remove code that should
   no longer be used.

 * Developer support to emulate unsatisfied prerequisites in tests to
   ensure that the remainder of the tests still succeeds when tests
   with prerequisites are skipped.

 * "git update-server-info" learned not to rewrite the file with the
   same contents.

 * The way of specifying the path to find dynamic libraries at runtime
   has been simplified.  The old default to pass -R/path/to/dir has been
   replaced with the new default to pass -Wl,-rpath,/path/to/dir,
   which is the more recent GCC uses.  Those who need to build with an
   old GCC can still use "CC_LD_DYNPATH=-R"

 * Prepare use of reachability index in topological walker that works
   on a range (A..B).

 * A new tutorial targeting specifically aspiring git-core
   developers has been added.

 * Auto-detect how to tell HP-UX aCC where to use dynamically linked
   libraries from at runtime.

 * "git mergetool" and its tests now spawn fewer subprocesses.

 * Dev support update to help tracing out tests.

 * Support to build with MSVC has been updated.

 * "git fetch" that grabs from a group of remotes learned to run the
   auto-gc only once at the very end.

 * A handful of Windows build patches have been upstreamed.

 * The code to read state files used by the sequencer machinery for
   "git status" has been made more robust against a corrupt or stale
   state files.

 * "git for-each-ref" with multiple patterns have been optimized.

 * The tree-walk API learned to pass an in-core repository
   instance throughout more codepaths.

 * When one step in multi step cherry-pick or revert is reset or
   committed, the command line prompt script failed to notice the
   current status, which has been improved.

 * Many GIT_TEST_* environment variables control various aspects of
   how our tests are run, but a few followed "non-empty is true, empty
   or unset is false" while others followed the usual "there are a few
   ways to spell true, like yes, on, etc., and also ways to spell
   false, like no, off, etc." convention.

 * Adjust the dir-iterator API and apply it to the local clone
   optimization codepath.

 * We have been trying out a few language features outside c89; the
   coding guidelines document did not talk about them and instead had
   a blanket ban against them.

 * A test helper has been introduced to optimize preparation of test
   repositories with many simple commits, and a handful of test
   scripts have been updated to use it.

Fixes since v2.22
-----------------

 * A relative pathname given to "git init --template=<path> <repo>"
   ought to be relative to the directory "git init" gets invoked in,
   but it instead was made relative to the repository, which has been
   corrected.

 * "git worktree add" used to fail when another worktree connected to
   the same repository was corrupt, which has been corrected.

 * The ownership rule for the file descriptor to fast-import remote
   backend was mixed up, leading to an unrelated file descriptor getting
   closed, which has been fixed.

 * A "merge -c" instruction during "git rebase --rebase-merges" should
   give the user a chance to edit the log message, even when there is
   otherwise no need to create a new merge and replace the existing
   one (i.e. fast-forward instead), but did not.  Which has been
   corrected.

 * Code cleanup and futureproof.

 * More parameter validation.

 * "git update-server-info" used to leave stale packfiles in its
   output, which has been corrected.

 * The server side support for "git fetch" used to show incorrect
   value for the HEAD symbolic ref when the namespace feature is in
   use, which has been corrected.

 * "git am -i --resolved" segfaulted after trying to see a commit as
   if it were a tree, which has been corrected.

 * "git bundle verify" needs to see if prerequisite objects exist in
   the receiving repository, but the command did not check if we are
   in a repository upfront, which has been corrected.

 * "git merge --squash" is designed to update the working tree and the
   index without creating the commit, and this cannot be countermanded
   by adding the "--commit" option; the command now refuses to work
   when both options are given.

 * The data collected by fsmonitor was not properly written back to
   the on-disk index file, breaking t7519 tests occasionally, which
   has been corrected.

 * Update to Unicode 12.1 width table.

 * The command line to invoke a "git cat-file" command from inside
   "git p4" was not properly quoted to protect a caret and running a
   broken command on Windows, which has been corrected.

 * "git request-pull" learned to warn when the ref we ask them to pull
   from in the local repository and in the published repository are
   different.

 * When creating a partial clone, the object filtering criteria is
   recorded for the origin of the clone, but this incorrectly used a
   hardcoded name "origin" to name that remote; it has been corrected
   to honor the "--origin <name>" option.

 * "git fetch" into a lazy clone forgot to fetch base objects that are
   necessary to complete delta in a thin packfile, which has been
   corrected.

 * The filter_data used in the list-objects-filter (which manages a
   lazily sparse clone repository) did not use the dynamic array API
   correctly---'nr' is supposed to point at one past the last element
   of the array in use.  This has been corrected.

 * The description about slashes in gitignore patterns (used to
   indicate things like "anchored to this level only" and "only
   matches directories") has been revamped.

 * The URL decoding code has been updated to avoid going past the end
   of the string while parsing %-<hex>-<hex> sequence.

 * The list of for-each like macros used by clang-format has been
   updated.

 * "git branch --list" learned to show branches that are checked out
   in other worktrees connected to the same repository prefixed with
   '+', similar to the way the currently checked out branch is shown
   with '*' in front.
   (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint).

 * Code restructuring during 2.20 period broke fetching tags via
   "import" based transports.

 * The commit-graph file is now part of the "files that the runtime
   may keep open file descriptors on, all of which would need to be
   closed when done with the object store", and the file descriptor to
   an existing commit-graph file now is closed before "gc" finalizes a
   new instance to replace it.

 * "git checkout -p" needs to selectively apply a patch in reverse,
   which did not work well.

 * Code clean-up to avoid signed integer wraparounds during binary search.

 * "git interpret-trailers" always treated '#' as the comment
   character, regardless of core.commentChar setting, which has been
   corrected.

 * "git stash show 23" used to work, but no more after getting
   rewritten in C; this regression has been corrected.

 * "git rebase --abort" used to leave refs/rewritten/ when concluding
   "git rebase -r", which has been corrected.

 * An incorrect list of options was cached after command line
   completion failed (e.g. trying to complete a command that requires
   a repository outside one), which has been corrected.

 * The code to parse scaled numbers out of configuration files has
   been made more robust and also easier to follow.

 * The codepath to compute delta islands used to spew progress output
   without giving the callers any way to squelch it, which has been
   fixed.

 * Protocol capabilities that go over wire should never be translated,
   but it was incorrectly marked for translation, which has been
   corrected.  The output of protocol capabilities for debugging has
   been tweaked a bit.

 * Use "Erase in Line" CSI sequence that is already used in the editor
   support to clear cruft in the progress output.

 * "git submodule foreach" did not protect command line options passed
   to the command to be run in each submodule correctly, when the
   "--recursive" option was in use.

 * The configuration variable rebase.rescheduleFailedExec should be
   effective only while running an interactive rebase and should not
   affect anything when running a non-interactive one, which was not
   the case.  This has been corrected.

 * The "git clone" documentation refers to command line options in its
   description in the short form; they have been replaced with long
   forms to make them more recognisable.

 * Generation of pack bitmaps are now disabled when .keep files exist,
   as these are mutually exclusive features.
   (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint).

 * "git rm" to resolve a conflicted path leaked an internal message
   "needs merge" before actually removing the path, which was
   confusing.  This has been corrected.

 * "git stash --keep-index" did not work correctly on paths that have
   been removed, which has been fixed.
   (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).

 * Window 7 update ;-)

 * A codepath that reads from GPG for signed object verification read
   past the end of allocated buffer, which has been fixed.

 * "git clean" silently skipped a path when it cannot lstat() it; now
   it gives a warning.

 * "git push --atomic" that goes over the transport-helper (namely,
   the smart http transport) failed to prevent refs to be pushed when
   it can locally tell that one of the ref update will fail without
   having to consult the other end, which has been corrected.

 * The internal diff machinery can be made to read out of bounds while
   looking for --function-context line in a corner case, which has been
   corrected.
   (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).

 * Other code cleanup, docfix, build fix, etc.
   (merge fbec05c210 cc/test-oidmap later to maint).
   (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint).
   (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint).
   (merge d61e6ce1dd sg/fsck-config-in-doc later to maint).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.89 -r1.90 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/git-docs/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/git-docs/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/git-gitk/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/gitweb/Makefile

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
diff -u pkgsrc/devel/git/Makefile:1.5 pkgsrc/devel/git/Makefile:1.6
--- pkgsrc/devel/git/Makefile:1.5       Wed Jul 17 14:33:28 2019
+++ pkgsrc/devel/git/Makefile   Tue Aug 20 13:00:02 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/07/17 14:33:28 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/20 13:00:02 adam Exp $
 
 .include "../../devel/git/Makefile.version"
 
 DISTNAME=      # empty
 PKGNAME=       git-${GIT_VERSION}
-PKGREVISION=   1
 CATEGORIES+=   meta-pkgs devel
 DISTFILES=     # empty
 MASTER_SITES=  http://www.kernel.org/pub/software/scm/git/

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.79 pkgsrc/devel/git/Makefile.version:1.80
--- pkgsrc/devel/git/Makefile.version:1.79      Sun Jun  9 16:15:32 2019
+++ pkgsrc/devel/git/Makefile.version   Tue Aug 20 13:00:02 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.79 2019/06/09 16:15:32 ryoon Exp $
+# $NetBSD: Makefile.version,v 1.80 2019/08/20 13:00:02 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.22.0
+GIT_VERSION=   2.23.0

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.66 pkgsrc/devel/git-base/Makefile:1.67
--- pkgsrc/devel/git-base/Makefile:1.66 Sun Aug 11 13:18:43 2019
+++ pkgsrc/devel/git-base/Makefile      Tue Aug 20 13:00:02 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.66 2019/08/11 13:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2019/08/20 13:00:02 adam Exp $
 
-PKGREVISION= 3
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.25 pkgsrc/devel/git-base/PLIST:1.26
--- pkgsrc/devel/git-base/PLIST:1.25    Sun Jun  9 16:15:32 2019
+++ pkgsrc/devel/git-base/PLIST Tue Aug 20 13:00:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2019/06/09 16:15:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.26 2019/08/20 13:00:02 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -69,6 +69,7 @@ libexec/git-core/git-diff-index
 libexec/git-core/git-diff-tree
 libexec/git-core/git-difftool
 libexec/git-core/git-difftool--helper
+libexec/git-core/git-env--helper
 libexec/git-core/git-fast-export
 libexec/git-core/git-fast-import
 libexec/git-core/git-fetch
@@ -132,8 +133,6 @@ libexec/git-core/git-quiltimport
 libexec/git-core/git-range-diff
 libexec/git-core/git-read-tree
 libexec/git-core/git-rebase
-libexec/git-core/git-rebase--am
-libexec/git-core/git-rebase--common
 libexec/git-core/git-rebase--preserve-merges
 libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
@@ -150,6 +149,7 @@ libexec/git-core/git-replace
 libexec/git-core/git-request-pull
 libexec/git-core/git-rerere
 libexec/git-core/git-reset
+libexec/git-core/git-restore
 libexec/git-core/git-rev-list
 libexec/git-core/git-rev-parse
 libexec/git-core/git-revert
@@ -172,6 +172,7 @@ libexec/git-core/git-stripspace
 libexec/git-core/git-submodule
 libexec/git-core/git-submodule--helper
 libexec/git-core/git-svn
+libexec/git-core/git-switch
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
 libexec/git-core/git-unpack-file

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.89 pkgsrc/devel/git-base/distinfo:1.90
--- pkgsrc/devel/git-base/distinfo:1.89 Sun Jun  9 16:15:32 2019
+++ pkgsrc/devel/git-base/distinfo      Tue Aug 20 13:00:02 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.89 2019/06/09 16:15:32 ryoon Exp $
+$NetBSD: distinfo,v 1.90 2019/08/20 13:00:02 adam Exp $
 
-SHA1 (git-2.22.0.tar.xz) = 4984f9f7d32e7f967cee15dce4973c231b2308a1
-RMD160 (git-2.22.0.tar.xz) = a427f61cbc0bc40de23570f1f35fa082221e5c90
-SHA512 (git-2.22.0.tar.xz) = 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42
-Size (git-2.22.0.tar.xz) = 5609772 bytes
+SHA1 (git-2.23.0.tar.xz) = fc627f8cb994c60ae6c4580ca514af2a18c464d7
+RMD160 (git-2.23.0.tar.xz) = fc260e2f2e762f0156ba0639853d8708cffe5b38
+SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
+Size (git-2.23.0.tar.xz) = 5707148 bytes
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23

Index: pkgsrc/devel/git-docs/Makefile
diff -u pkgsrc/devel/git-docs/Makefile:1.13 pkgsrc/devel/git-docs/Makefile:1.14
--- pkgsrc/devel/git-docs/Makefile:1.13 Sun Aug 11 13:18:43 2019
+++ pkgsrc/devel/git-docs/Makefile      Tue Aug 20 13:00:02 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/20 13:00:02 adam Exp $
 
 PKGNAME=       git-docs-${GIT_VERSION}
-PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (documentation)
 
 CONFLICTS+=            scmgit-docs-[0-9]*

Index: pkgsrc/devel/git-docs/PLIST
diff -u pkgsrc/devel/git-docs/PLIST:1.12 pkgsrc/devel/git-docs/PLIST:1.13
--- pkgsrc/devel/git-docs/PLIST:1.12    Sun Jun  9 16:15:33 2019
+++ pkgsrc/devel/git-docs/PLIST Tue Aug 20 13:00:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/06/09 16:15:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/08/20 13:00:02 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -110,6 +110,7 @@ man/man1/git-replace.1
 man/man1/git-request-pull.1
 man/man1/git-rerere.1
 man/man1/git-reset.1
+man/man1/git-restore.1
 man/man1/git-rev-list.1
 man/man1/git-rev-parse.1
 man/man1/git-revert.1
@@ -131,6 +132,7 @@ man/man1/git-status.1
 man/man1/git-stripspace.1
 man/man1/git-submodule.1
 man/man1/git-svn.1
+man/man1/git-switch.1
 man/man1/git-symbolic-ref.1
 man/man1/git-tag.1
 man/man1/git-unpack-file.1

Index: pkgsrc/devel/git-gitk/PLIST
diff -u pkgsrc/devel/git-gitk/PLIST:1.6 pkgsrc/devel/git-gitk/PLIST:1.7
--- pkgsrc/devel/git-gitk/PLIST:1.6     Sat Feb 25 08:32:57 2017
+++ pkgsrc/devel/git-gitk/PLIST Tue Aug 20 13:00:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/08/20 13:00:02 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -23,10 +23,6 @@ share/git-gui/lib/date.tcl
 share/git-gui/lib/diff.tcl
 share/git-gui/lib/encoding.tcl
 share/git-gui/lib/error.tcl
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP}
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns
 share/git-gui/lib/git-gui.ico
 ${PLIST.macosx}share/git-gui/lib/git-gui.tcl
 share/git-gui/lib/index.tcl

Index: pkgsrc/www/gitweb/Makefile
diff -u pkgsrc/www/gitweb/Makefile:1.38 pkgsrc/www/gitweb/Makefile:1.39
--- pkgsrc/www/gitweb/Makefile:1.38     Sun Aug 11 13:24:19 2019
+++ pkgsrc/www/gitweb/Makefile  Tue Aug 20 13:00:02 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.38 2019/08/11 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/08/20 13:00:02 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/git/gitweb/}