Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1634108170208850"
MIME-Version: 1.0
Date: Wed, 13 Oct 2021 06:56:10 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/devel
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20211013065610.17391FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1634108170208850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Wed Oct 13 06:56:09 UTC 2021

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

Log Message:
git: updated to 2.33.1

Git 2.33.1 Release Notes
========================

This primarily is to backport various fixes accumulated during the
development towards Git 2.34, the next feature release.

Fixes since v2.33
-----------------

 * The unicode character width table (used for output alignment) has
   been updated.

 * Input validation of "git pack-objects --stdin-packs" has been
   corrected.

 * Bugfix for common ancestor negotiation recently introduced in "git
   push" codepath.

 * "git pull" had various corner cases that were not well thought out
   around its --rebase backend, e.g. "git pull --ff-only" did not stop
   but went ahead and rebased when the history on other side is not a
   descendant of our history.  The series tries to fix them up.

 * "git apply" miscounted the bytes and failed to read to the end of
   binary hunks.

 * "git range-diff" code clean-up.

 * "git commit --fixup" now works with "--edit" again, after it was
   broken in v2.32.

 * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
   new version has a blocker bug for that architecture.

 * Checking out all the paths from HEAD during the last conflicted
   step in "git rebase" and continuing would cause the step to be
   skipped (which is expected), but leaves MERGE_MSG file behind in
   $GIT_DIR and confuses the next "git commit", which has been
   corrected.

 * Various bugs in "git rebase -r" have been fixed.

 * mmap() imitation used to call xmalloc() that dies upon malloc()
   failure, which has been corrected to just return an error to the
   caller to be handled.

 * "git diff --relative" segfaulted and/or produced incorrect result
   when there are unmerged paths.

 * The delayed checkout code path in "git checkout" etc. were chatty
   even when --quiet and/or --no-progress options were given.

 * "git branch -D <branch>" used to refuse to remove a broken branch
   ref that points at a missing commit, which has been corrected.

 * Build update for Apple clang.

 * The parser for the "--nl" option of "git column" has been
   corrected.

 * "git upload-pack" which runs on the other side of "git fetch"
   forgot to take the ref namespaces into account when handling
   want-ref requests.

 * The sparse-index support can corrupt the index structure by storing
   a stale and/or uninitialized data, which has been corrected.

 * Buggy tests could damage repositories outside the throw-away test
   area we created.  We now by default export GIT_CEILING_DIRECTORIES
   to limit the damage from such a stray test.

 * Even when running "git send-email" without its own threaded
   discussion support, a threading related header in one message is
   carried over to the subsequent message to result in an unwanted
   threading, which has been corrected.

 * The output from "git fast-export", when its anonymization feature
   is in use, showed an annotated tag incorrectly.

 * Recent "diff -m" changes broke "gitk", which has been corrected.

 * "git maintenance" scheduler fix for macOS.

 * A pathname in an advice message has been made cut-and-paste ready.

 * The "git apply -3" code path learned not to bother the lower level
   merge machinery when the three-way merge can be trivially resolved
   without the content level merge.

 * The code that optionally creates the *.rev reverse index file has
   been optimized to avoid needless computation when it is not writing
   the file out.

 * "git range-diff -I... <range> <range>" segfaulted, which has been
   corrected.

 * The order in which various files that make up a single (conceptual)
   packfile has been reevaluated and straightened up.  This matters in
   correctness, as an incomplete set of files must not be shown to a
   running Git.

 * The "mode" word is useless in a call to open(2) that does not
   create a new file.  Such a call in the files backend of the ref
   subsystem has been cleaned up.

 * "git update-ref --stdin" failed to flush its output as needed,
   which potentially led the conversation to a deadlock.

 * When "git am --abort" fails to abort correctly, it still exited
   with exit status of 0, which has been corrected.

 * Correct nr and alloc members of strvec struct to be of type size_t.

 * "git stash", where the tentative change involves changing a
   directory to a file (or vice versa), was confused, which has been
   corrected.

 * "git clone" from a repository whose HEAD is unborn into a bare
   repository didn't follow the branch name the other side used, which
   is corrected.

 * "git cvsserver" had a long-standing bug in its authentication code,
   which has finally been corrected (it is unclear and is a separate
   question if anybody is seriously using it, though).

 * "git difftool --dir-diff" mishandled symbolic links.

 * Sensitive data in the HTTP trace were supposed to be redacted, but
   we failed to do so in HTTP/2 requests.

 * "make clean" has been updated to remove leftover .depend/
   directories, even when it is not told to use them to compute header
   dependencies.

 * Protocol v0 clients can get stuck parsing a malformed feature line.

Also contains various documentation updates and code clean-ups.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.92 -r1.93 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/git-docs/PLIST

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


--_----------=_1634108170208850
Content-Disposition: inline
Content-Length: 2862
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.97 pkgsrc/devel/git/Makefile.version:1.98
--- pkgsrc/devel/git/Makefile.version:1.97	Mon Aug 23 10:41:25 2021
+++ pkgsrc/devel/git/Makefile.version	Wed Oct 13 06:56:09 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.97 2021/08/23 10:41:25 adam Exp $
+# $NetBSD: Makefile.version,v 1.98 2021/10/13 06:56:09 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.33.0
+GIT_VERSION=	2.33.1

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.92 pkgsrc/devel/git-base/Makefile:1.93
--- pkgsrc/devel/git-base/Makefile:1.92	Wed Sep 29 19:00:31 2021
+++ pkgsrc/devel/git-base/Makefile	Wed Oct 13 06:56:09 2021
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.92 2021/09/29 19:00:31 adam Exp $
+# $NetBSD: Makefile,v 1.93 2021/10/13 06:56:09 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.110 pkgsrc/devel/git-base/distinfo:1.111
--- pkgsrc/devel/git-base/distinfo:1.110	Thu Oct  7 13:39:36 2021
+++ pkgsrc/devel/git-base/distinfo	Wed Oct 13 06:56:09 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.110 2021/10/07 13:39:36 nia Exp $
+$NetBSD: distinfo,v 1.111 2021/10/13 06:56:09 adam Exp $
 
-RMD160 (git-2.33.0.tar.xz) = c1aa086fc178020862b837ea5c0c81687126361e
-SHA512 (git-2.33.0.tar.xz) = 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd
-Size (git-2.33.0.tar.xz) = 6548308 bytes
+RMD160 (git-2.33.1.tar.xz) = eb4398bfd5936af6b21531239a425e7931eda488
+SHA512 (git-2.33.1.tar.xz) = 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
+Size (git-2.33.1.tar.xz) = 6558636 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886

Index: pkgsrc/devel/git-docs/PLIST
diff -u pkgsrc/devel/git-docs/PLIST:1.18 pkgsrc/devel/git-docs/PLIST:1.19
--- pkgsrc/devel/git-docs/PLIST:1.18	Wed Mar 31 08:04:21 2021
+++ pkgsrc/devel/git-docs/PLIST	Wed Oct 13 06:56:09 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2021/03/31 08:04:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2021/10/13 06:56:09 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -149,6 +149,7 @@ man/man1/git-var.1
 man/man1/git-verify-commit.1
 man/man1/git-verify-pack.1
 man/man1/git-verify-tag.1
+man/man1/git-version.1
 man/man1/git-web--browse.1
 man/man1/git-whatchanged.1
 man/man1/git-worktree.1


--_----------=_1634108170208850--