CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 16 08:45:32 UTC 2025

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

Log Message:
git: updated to 2.51.1

Git 2.51.1 Release Notes
========================

There shouldn't be anything exciting to see here.  This is primarily
to flush the "do you still use it?" improvements that has landed on
the master front, together with a handful of low-hanging, low-impact
fixes that should be safe.

Fixes since Git 2.51.0
----------------------

 * The "do you still use it?" message given by a command that is
   deeply deprecated and allow us to suggest alternatives has been
   updated.

 * The compatObjectFormat extension is used to hide an incomplete
   feature that is not yet usable for any purpose other than
   developing the feature further.  Document it as such to discourage
   its use by mere mortals.

 * Manual page for "gitk" is updated with the current maintainer's
   name.

 * Update the instructions for using GGG in the MyFirstContribution
   document to say that a GitHub PR could be made against `git/git`
   instead of `gitgitgadget/git`.

 * Clang-format update to let our control macros be formatted the way we
   had them traditionally, e.g., "for_each_string_list_item()" without
   space before the parentheses.

 * A few places where a size_t value was cast to curl_off_t without
   checking has been updated to use the existing helper function.

 * The start_delayed_progress() function in the progress eye-candy API
   did not clear its internal state, making an initial delay value
   larger than 1 second ineffective, which has been corrected.

 * Makefile tried to run multiple "cargo build" which would not work
   very well; serialize their execution to work around this problem.

 * Adjust to the way newer versions of cURL selectively enable tracing
   options, so that our tests can continue to work.

 * During interactive rebase, using 'drop' on a merge commit led to
   an error, which has been corrected.

 * "git refs migrate" to migrate the reflog entries from a refs
   backend to another had a handful of bugs squashed.

 * "git push" had a code path that led to BUG() but it should have
   been a die(), as it is a response to a usual but invalid end-user
   action to attempt pushing an object that does not exist.

 * Various bugs about rename handling in "ort" merge strategy have
   been fixed.

 * "git diff --no-index" run inside a subdirectory under control of a
   Git repository operated at the top of the working tree and stripped
   the prefix from the output, and oddballs like "-" (stdin) did not
   work correctly because of it.  Correct the set-up by undoing what
   the set-up sequence did to cwd and prefix.

 * Various options to "git diff" that make comparison ignore certain
   aspects of the differences (like "space changes are ignored",
   "differences in lines that match these regular expressions are
   ignored") did not work well with "--name-only" and friends.

 * Under a race against another process that is repacking the
   repository, especially a partially cloned one, "git fetch" may
   mistakenly think some objects we do have are missing, which has
   been corrected.

 * "git repack --path-walk" lost objects in some corner cases, which
   has been corrected.
   cf. <CABPp-BHFxxGrqKc0m==TjQNjDGdO=H5Rf6EFsf2nfE1=TuraOQ%mail.gmail.com@localhost>

 * Fixes multiple crashes around midx write-out codepaths.

 * A broken or malicious "git fetch" can say that it has the same
   object for many many times, and the upload-pack serving it can
   exhaust memory storing them redundantly, which has been corrected.

 * A corner case bug in "git log -L..." has been corrected.

 * Some among "git add -p" and friends ignored color.diff and/or
   color.ui configuration variables, which is an old regression, which
   has been corrected.

 * "git rebase -i" failed to clean-up the commit log message when the
   command commits the final one in a chain of "fixup" commands, which
   has been corrected.

 * Deal more gracefully with directory / file conflicts when the files
   backend is used for ref storage, by failing only the ones that are
   involved in the conflict while allowing others.

Also contains various documentation updates, code cleanups and minor fixups.


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.127 -r1.128 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.158 -r1.159 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/git-gitk/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.version
diff -u pkgsrc/devel/git/Makefile.version:1.138 pkgsrc/devel/git/Makefile.version:1.139
--- pkgsrc/devel/git/Makefile.version:1.138     Mon Aug 18 19:36:35 2025
+++ pkgsrc/devel/git/Makefile.version   Thu Oct 16 08:45:32 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.138 2025/08/18 19:36:35 adam Exp $
+# $NetBSD: Makefile.version,v 1.139 2025/10/16 08:45:32 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.51.0
+GIT_VERSION=   2.51.1

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.127 pkgsrc/devel/git-base/Makefile:1.128
--- pkgsrc/devel/git-base/Makefile:1.127        Tue Oct  7 23:11:59 2025
+++ pkgsrc/devel/git-base/Makefile      Thu Oct 16 08:45:32 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.127 2025/10/07 23:11:59 js Exp $
+# $NetBSD: Makefile,v 1.128 2025/10/16 08:45:32 adam Exp $
 
-PKGREVISION= 2
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.158 pkgsrc/devel/git-base/distinfo:1.159
--- pkgsrc/devel/git-base/distinfo:1.158        Sun Oct  5 18:09:33 2025
+++ pkgsrc/devel/git-base/distinfo      Thu Oct 16 08:45:32 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.158 2025/10/05 18:09:33 js Exp $
+$NetBSD: distinfo,v 1.159 2025/10/16 08:45:32 adam Exp $
 
-BLAKE2s (git-2.51.0.tar.xz) = a6f9ca63b9af0ec1ed1024935697c19267b4aae2aeef07273a164c7abddafb2b
-SHA512 (git-2.51.0.tar.xz) = 2b8c59589266c0c9e58a9f4fda4a970a8a492e2e0ecbafc414fcfacac4a04251f0115b3676f4599a415b53906f1dea312b18a42e9bde455286abd62ec327beaf
-Size (git-2.51.0.tar.xz) = 7857228 bytes
+BLAKE2s (git-2.51.1.tar.xz) = 8da1a3811296b824c46894daaaa8624eeacb763b29b46c2cc3ccb2d72a4c7c7f
+SHA512 (git-2.51.1.tar.xz) = bc22d26bbfad4a549d2fb6bed11eb019c2dee607c86bf8faaa986774e526e5b367d80c9a79ab50358624634d840e8e0d27e0b46411d1aabbf76728b7a7f138dd
+Size (git-2.51.1.tar.xz) = 7865216 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 24b9ed15f5ef59973d17d5217dd4e415a3b4c3e5
 SHA1 (patch-config.mak.uname) = 97af198645ca57cf5119ca0ca6003b03004988c0

Index: pkgsrc/devel/git-gitk/Makefile
diff -u pkgsrc/devel/git-gitk/Makefile:1.11 pkgsrc/devel/git-gitk/Makefile:1.12
--- pkgsrc/devel/git-gitk/Makefile:1.11 Wed Aug 20 08:47:19 2025
+++ pkgsrc/devel/git-gitk/Makefile      Thu Oct 16 08:45:32 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2025/08/20 08:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2025/10/16 08:45:32 adam Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
-PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (gitk)
 
 CONFLICTS+=    git-base<1.7.12nb1