CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Nov  3 10:49:39 UTC 2023

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

Log Message:
git: updated to 2.42.1

Git 2.42.1 Release Notes
========================

There is nothing exciting to see here.  Relative to Git 2.42, this
release contains the fixes that have already been merged to the
'master' branch of the development towards Git 2.43 that has been
tagged as Git 2.43.0-rc0.

Fixes since Git 2.42.0
----------------------

 * Tests that are known to pass with LSan are now marked as such.

 * Flaky "git p4" tests, as well as "git svn" tests, are now skipped
   in the (rather expensive) sanitizer CI job.

 * Tests with LSan from time to time seem to emit harmless message
   that makes our tests unnecessarily flaky; we work it around by
   filtering the uninteresting output.

 * GitHub CI workflow has learned to trigger Coverity check.

 * Overly long label names used in the sequencer machinery are now
   chopped to fit under filesystem limitation.

 * Scalar updates.

 * Tweak GitHub Actions CI so that pushing the same commit to multiple
   branch tips at the same time will not waste building and testing
   the same thing twice.

 * The commit-graph verification code that detects mixture of zero and
   non-zero generation numbers has been updated.

 * "git diff -w --exit-code" with various options did not work
   correctly, which is being addressed.

 * transfer.unpackLimit ought to be used as a fallback, but overrode
   fetch.unpackLimit and receive.unpackLimit instead.

 * The use of API between two calls to require_clean_work_tree() from
   the sequencer code has been cleaned up for consistency.

 * "git diff --no-such-option" and other corner cases around the exit
   status of the "diff" command has been corrected.

 * "git for-each-ref --sort='contents:size'" sorts the refs according
   to size numerically, giving a ref that points at a blob twelve-byte
   (12) long before showing a blob hundred-byte (100) long.

 * Various fixes to the behavior of "rebase -i" when the command got
   interrupted by conflicting changes.

 * References from description of the `--patch` option in various
   manual pages have been simplified and improved.

 * "git grep -e A --no-or -e B" is accepted, even though the negation
   of "or" did not mean anything, which has been tightened.

 * The completion script (in contrib/) has been taught to treat the
   "-t" option to "git checkout" and "git switch" just like the
   "--track" option, to complete remote-tracking branches.

 * "git diff --no-index -R <(one) <(two)" did not work correctly,
   which has been corrected.

 * Update "git maintenance" timers' implementation based on systemd
   timers to work with WSL.

 * "git diff --cached" codepath did not fill the necessary stat
   information for a file when fsmonitor knows it is clean and ended
   up behaving as if it is not clean, which has been corrected.

 * Clarify how "alias.foo = : git cmd ; aliased-command-string" should
   be spelled with necessary whitespaces around punctuation marks to
   work.

 * HTTP Header redaction code has been adjusted for a newer version of
   cURL library that shows its traces differently from earlier
   versions.

 * An error message given by "git send-email" when given a malformed
   address did not give correct information, which has been corrected.

 * UBSan options were not propagated through the test framework to git
   run via the httpd, unlike ASan options, which has been corrected.

Also contains various documentation updates, code clean-ups and minor fixups.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.109 -r1.110 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.137 -r1.138 pkgsrc/devel/git-base/distinfo

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.119 pkgsrc/devel/git/Makefile.version:1.120
--- pkgsrc/devel/git/Makefile.version:1.119     Thu Aug 24 09:33:30 2023
+++ pkgsrc/devel/git/Makefile.version   Fri Nov  3 10:49:39 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.119 2023/08/24 09:33:30 adam Exp $
+# $NetBSD: Makefile.version,v 1.120 2023/11/03 10:49:39 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.42.0
+GIT_VERSION=   2.42.1

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.109 pkgsrc/devel/git-base/Makefile:1.110
--- pkgsrc/devel/git-base/Makefile:1.109        Tue Oct 24 22:08:44 2023
+++ pkgsrc/devel/git-base/Makefile      Fri Nov  3 10:49:39 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.109 2023/10/24 22:08:44 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2023/11/03 10:49:39 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.137 pkgsrc/devel/git-base/distinfo:1.138
--- pkgsrc/devel/git-base/distinfo:1.137        Thu Aug 24 09:33:30 2023
+++ pkgsrc/devel/git-base/distinfo      Fri Nov  3 10:49:39 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.137 2023/08/24 09:33:30 adam Exp $
+$NetBSD: distinfo,v 1.138 2023/11/03 10:49:39 adam Exp $
 
-BLAKE2s (git-2.42.0.tar.xz) = f3685c6502ade2acfe1995b7efea0d62f3d34bfd62969f2d360bc59896de9b54
-SHA512 (git-2.42.0.tar.xz) = afe5bca3c084d4ddd66f20afa820ba10f61007f66846108929e0d4ee7b7eaa896fcf00917dead16881d840f674dec6dd0e353a05e62a31016694af3d7d22a51d
-Size (git-2.42.0.tar.xz) = 7346760 bytes
+BLAKE2s (git-2.42.1.tar.xz) = fb0d117d63f7a9a131f5e5cb1d6ce8b754db88c50c3f0e9be5c6479125161b85
+SHA512 (git-2.42.1.tar.xz) = 5946699108d4181e14fc3c61e4a4ebadcf8a876248c3f570ca22e6d95d8fea4eeb424d6e0c897d180df5959b8b2e3b0dd4e005d4c38bed2d35a2ed8036e6dc95
+Size (git-2.42.1.tar.xz) = 7351412 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72
 SHA1 (patch-config.mak.uname) = c5985af246310023f63c7b8a9cebef84f53769f7