CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Sep 30 10:52:58 UTC 2026

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: Makefile PLIST distinfo
        pkgsrc/devel/git-base/patches: patch-git-gui_Makefile
        pkgsrc/devel/git-contrib: Makefile
        pkgsrc/devel/git-credential-osxkeychain: Makefile
        pkgsrc/devel/git-docs: Makefile
        pkgsrc/devel/git-gitk: Makefile
        pkgsrc/devel/git-perlscripts: Makefile
Removed Files:
        pkgsrc/www/gitweb: MESSAGE

Log Message:
git: updated to 2.56.0

Git v2.56 Release Notes

UI, Workflows & Features

Advice shown by "git status" when the local branch is behind or has
diverged from its push branch has been updated to suggest "git pull
<remote> <branch>".

The handling of promisor-remote protocol capability has been updated
to allow the other side to add to the list of promisor remotes via the
promisor.acceptFromServerURL configuration variable.

The ort merge backend has been hardened against corrupt trees by
ensuring it aborts under appropriate error conditions.

The fetch.followRemoteHEAD configuration variable has been added to
provide a default for the per-remote remote.<name>.followRemoteHEAD
setting.

"git log --follow" has been updated to better handle non-linear
history, in which the path being tracked gets renamed differently in
multiple history lines.

The "git repo info" command has been taught new keys to output both
absolute and relative paths for "gitdir" and "commondir", supported by
a new path-formatting helper extracted from "git rev-parse".

When git push origin/main or git branch origin main is run, the
command is now recognized as a potential typo, and advice has been
added to offer a typo fix.

The git refs toolbox has been extended with new create, delete,
update, and rename subcommands to create, delete, update, and
rename references, respectively.

The experimental git history command has been taught a new drop
subcommand to remove a commit, with its descendants replayed onto its
parent.

The alignment of commit object name abbreviations in git blame
output has been optimized to reserve a column for marks (caret,
question mark, or asterisk) only when such marks are actually shown.

Option parsing with git rev-parse --parseopt and in most git
subcommands has been updated to exit with 0 (instead of 129) when the
help option (-h or --help) is requested directly by the user,
aligning with standard Unix convention.

The [includeIf "condition"] conditional inclusion facility for
configuration files has been taught to use the location of the
worktree in its condition.

The usage string and SYNOPSIS for git fast-export have been
standardized to make them consistent with each other and with other
commands.

git log --graph has been modified to visually distinguish parentless
root commits (and commits that become roots due to history
simplification) by indenting them, preventing them from appearing
falsely related to unrelated commits rendered immediately above them.

Userdiff patterns for Swift have been added, with support for
Swift-specific constructs such as attributes, modifiers, failable
initializers, and generics.

Configuration file locking has been updated to retry for a short
period, avoiding failures when multiple processes attempt to update
the configuration simultaneously.

The remote-object-info command has been added to git cat-file
--batch-command, allowing clients to request object metadata
(currently size) from a remote server via protocol v2 without
downloading the entire object.  Format placeholders are dynamically
filtered on the client based on server-advertised capabilities,
returning empty strings for inapplicable or unsupported fields.

git branch -d has been taught to report when a branch cannot be
deleted because it is being used in an active bisect run.

git mv has been updated to check for a missing destination
leading directory during the checking phase, allowing git mv -n
to report the failure.  The error message when the rename(2)
syscall fails has also been improved to name both the source and
the destination.

git add has been taught a new --resolved option to stage
conflict-resolved paths, while leaving unrelated local changes
unstaged.  It scans the unmerged paths for leftover conflict
markers and aborts if any are found.

The known limitations of the ref format migration in git refs have
been moved to be displayed as a warning admonition directly under the
description of the migrate subcommand, improving visibility.  A
reference to git-maintenance has also been corrected to use the
linkgit macro.

The git bisect command has been taught a
--reset-when-found[=<where>] option that tells the command to
automatically run git bisect reset to jump back to the original
state or to the found culprit.

The git branch command has been taught the --delete-merged option
to remove local branches that are already merged into their tracked
remote-tracking branches.

The remote-object-info command for git cat-file --batch-command
has been extended to support the %(objecttype) placeholder.

The usage string of git fast-import has been updated to use the
parse_options() API for displaying help, and its SYNOPSIS in the
documentation has been standardized to match.

The error message given by git send-email when a message file is
missing a Subject: header has been clarified, and the error string
is now terminated with a newline so that Perl avoids appending its
internal source location data.

The --shallow-file option of git command requires a value, but the
code did not check the presence of a value and instead segfaulted
without one, which has been corrected.

git repack has been taught --drop-filtered to delete local
promisor blobs exceeding a limit (currently blob:limit=) in partial
clones, reclaiming space.  Guards prevent running during other
operations or if referenced by the index.

The documentation for git format-rev has been updated to use the
[synopsis] block definition on code blocks to properly highlight
placeholders, and a quoting inconsistency in the running text has
been fixed.

The DWIM logic in git worktree add sometimes tried to infer a
remote-tracking branch when an explicit -b or -B option was
given to create a new branch, causing the explicit branch name to
be ignored, which has been corrected.

The command line completion (in contrib/) has been taught to handle
the experimental git history command.

git checkout and git worktree add makes guesses based on a name
of a remote-tracking branch, but does not give an error when such a
remote-tracking branch cannot be uniquely identified, which has
been corrected.

The git replay command has been taught the --linearize option to
drop merge commits and linearize the replayed history, mimicking git
rebase --no-rebase-merges.

The documentation for git cherry-pick has been updated to clarify
that the --no-commit option intentionally skips setting the
CHERRY_PICK_HEAD ref.  A test has also been added to ensure this
behavior holds even when the operation stops for conflicts.

The git imap-send command has been taught to take the --draft
option to mark uploaded messages as drafts, which helps some email
clients render them properly for editing and sending.

The git rev-list command has been augmented with a --missing-only
option that filters the output to only show missing objects,
stripping the leading ? character and suppressing present objects,
which is useful when used in combination with --missing=print or
--missing=print-info.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.141 -r1.142 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.164 -r1.165 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-base/patches/patch-git-gui_Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-contrib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/git-credential-osxkeychain/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/git-docs/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/git-gitk/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/git-perlscripts/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/www/gitweb/MESSAGE

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.144 pkgsrc/devel/git/Makefile.version:1.145
--- pkgsrc/devel/git/Makefile.version:1.144     Tue Jun 30 08:12:33 2026
+++ pkgsrc/devel/git/Makefile.version   Wed Sep 30 10:52:57 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.144 2026/06/30 08:12:33 adam Exp $
+# $NetBSD: Makefile.version,v 1.145 2026/09/30 10:52:57 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.55.0
+GIT_VERSION=   2.56.0

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.141 pkgsrc/devel/git-base/Makefile:1.142
--- pkgsrc/devel/git-base/Makefile:1.141        Tue Sep 29 06:04:22 2026
+++ pkgsrc/devel/git-base/Makefile      Wed Sep 30 10:52:57 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.141 2026/09/29 06:04:22 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2026/09/30 10:52:57 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.50 pkgsrc/devel/git-base/PLIST:1.51
--- pkgsrc/devel/git-base/PLIST:1.50    Tue Jun 30 08:12:33 2026
+++ pkgsrc/devel/git-base/PLIST Wed Sep 30 10:52:57 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2026/06/30 08:12:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.51 2026/09/30 10:52:57 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -218,6 +218,7 @@ share/examples/git/templates/hooks/push-
 share/examples/git/templates/hooks/sendemail-validate.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude
+share/locale/af/LC_MESSAGES/git.mo
 share/locale/bg/LC_MESSAGES/git.mo
 share/locale/ca/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
@@ -230,6 +231,7 @@ share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
 share/locale/ko/LC_MESSAGES/git.mo
 share/locale/pl/LC_MESSAGES/git.mo
+share/locale/pt_BR/LC_MESSAGES/git.mo
 share/locale/pt_PT/LC_MESSAGES/git.mo
 share/locale/ru/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.164 pkgsrc/devel/git-base/distinfo:1.165
--- pkgsrc/devel/git-base/distinfo:1.164        Tue Jun 30 08:12:33 2026
+++ pkgsrc/devel/git-base/distinfo      Wed Sep 30 10:52:57 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.164 2026/06/30 08:12:33 adam Exp $
+$NetBSD: distinfo,v 1.165 2026/09/30 10:52:57 adam Exp $
 
-BLAKE2s (git-2.55.0.tar.xz) = 3d1371e77bbf9888691b8f2a7d4177a956809d523ea285ad7eae1504e70e718c
-SHA512 (git-2.55.0.tar.xz) = 73a53e5e79e9c357884512ad9fe5788ce48c33fd7ebb49f7c68f63c872beb5c5766f4fd1a9d9a2d8c89c192dc801ac7339422e9eec644ada56215fe9803af741
-Size (git-2.55.0.tar.xz) = 8177180 bytes
+BLAKE2s (git-2.56.0.tar.xz) = 1c710277b914195d25eb247d8d72160935cd28a70c8cc59e008f93ec7852c9e2
+SHA512 (git-2.56.0.tar.xz) = d240240aac3ad17fce48861be91dc0cd899c59d3d6014f7e0cc4b3174ef37c4fbfd5b6c4a520a6f5d7e452e5ad97752b40774ab680dc226acc630173475c6b87
+Size (git-2.56.0.tar.xz) = 8489656 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 2ba998dab5c9d4159563e48e8dfde6409ed20974
 SHA1 (patch-config.mak.uname) = 97af198645ca57cf5119ca0ca6003b03004988c0
 SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
 SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d
-SHA1 (patch-git-gui_Makefile) = 16f0f2679a24aabc09af26ef1cc5b338993b6c12
+SHA1 (patch-git-gui_Makefile) = 74a0121bb657f7fe95239c199a5b46480fdfe5ec
 SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0
 SHA1 (patch-t-helper-test-rot13-filter.c) = 6694898541213cc235e9d9053cbc021b6dd3b2e5
 SHA1 (patch-t_unit-tests_clar_clar_sandbox.h) = 0176fc4b01ded93422c7c298c9182bb101930796

Index: pkgsrc/devel/git-base/patches/patch-git-gui_Makefile
diff -u pkgsrc/devel/git-base/patches/patch-git-gui_Makefile:1.5 pkgsrc/devel/git-base/patches/patch-git-gui_Makefile:1.6
--- pkgsrc/devel/git-base/patches/patch-git-gui_Makefile:1.5    Mon Aug 18 19:36:35 2025
+++ pkgsrc/devel/git-base/patches/patch-git-gui_Makefile        Wed Sep 30 10:52:57 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-git-gui_Makefile,v 1.5 2025/08/18 19:36:35 adam Exp $
+$NetBSD: patch-git-gui_Makefile,v 1.6 2026/09/30 10:52:57 adam Exp $
 
 Fix installation.
 
---- git-gui/Makefile.orig      2025-08-18 00:35:38.000000000 +0000
+--- git-gui/Makefile.orig      2026-09-28 04:30:55.000000000 +0000
 +++ git-gui/Makefile
 @@ -47,11 +47,11 @@ endif
  RM_RF     ?= rm -rf
@@ -20,7 +20,7 @@ Fix installation.
  INSTALL_L0 = rm -f # space is required here
  INSTALL_L1 = && ln # space is required here
 @@ -72,11 +72,11 @@ ifndef V
-       QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
+       QUIET_MSGFMT   = $(QUIET)echo '   ' MSGFMT '$@' &&
  
        INSTALL_D0 = dir=
 -      INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"

Index: pkgsrc/devel/git-contrib/Makefile
diff -u pkgsrc/devel/git-contrib/Makefile:1.7 pkgsrc/devel/git-contrib/Makefile:1.8
--- pkgsrc/devel/git-contrib/Makefile:1.7       Mon Jan 13 14:24:44 2025
+++ pkgsrc/devel/git-contrib/Makefile   Wed Sep 30 10:52:57 2026
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2025/01/13 14:24:44 adam Exp $
+# $NetBSD: Makefile,v 1.8 2026/09/30 10:52:57 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-contrib-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (contrib)
 
-TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
-TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= asciidoc>=0:../../textproc/asciidoc
+TOOL_DEPENDS+= xmlto>=0:../../textproc/xmlto
 
-DEPENDS+=      git-base-[0-9]*:../../devel/git-base
+DEPENDS+=      git-base>=0:../../devel/git-base
 
 BUILD_DIRS=    contrib/subtree
 

Index: pkgsrc/devel/git-credential-osxkeychain/Makefile
diff -u pkgsrc/devel/git-credential-osxkeychain/Makefile:1.2 pkgsrc/devel/git-credential-osxkeychain/Makefile:1.3
--- pkgsrc/devel/git-credential-osxkeychain/Makefile:1.2        Mon Jan 13 14:24:44 2025
+++ pkgsrc/devel/git-credential-osxkeychain/Makefile    Wed Sep 30 10:52:57 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2025/01/13 14:24:44 adam Exp $
+# $NetBSD: Makefile,v 1.3 2026/09/30 10:52:57 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-credential-osxkeychain-${GIT_VERSION}
 COMMENT=       Git macOS Keychain credential manager
 
-DEPENDS+=      git-base-[0-9]*:../../devel/git-base
+DEPENDS+=      git-base>=0:../../devel/git-base
 
 ONLY_FOR_PLATFORM=     Darwin-*-*
 

Index: pkgsrc/devel/git-docs/Makefile
diff -u pkgsrc/devel/git-docs/Makefile:1.23 pkgsrc/devel/git-docs/Makefile:1.24
--- pkgsrc/devel/git-docs/Makefile:1.23 Tue Jan 14 21:41:39 2025
+++ pkgsrc/devel/git-docs/Makefile      Wed Sep 30 10:52:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2025/01/14 21:41:39 adam Exp $
+# $NetBSD: Makefile,v 1.24 2026/09/30 10:52:58 adam Exp $
 
 PKGNAME=       git-docs-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (documentation)
@@ -6,8 +6,8 @@ COMMENT=        GIT Tree History Storage Tool (
 CONFLICTS+=    scmgit-docs-[0-9]*
 SUPERSEDES+=   scmgit-docs-[0-9]*
 
-TOOL_DEPENDS+=         asciidoc-[0-9]*:../../textproc/asciidoc
-TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+=         asciidoc>=0:../../textproc/asciidoc
+TOOL_DEPENDS+=         xmlto>=0:../../textproc/xmlto
 
 USE_TOOLS+=            perl
 CONFIGURE_ARGS+=       --with-perl=${PERL5:Q}

Index: pkgsrc/devel/git-gitk/Makefile
diff -u pkgsrc/devel/git-gitk/Makefile:1.12 pkgsrc/devel/git-gitk/Makefile:1.13
--- pkgsrc/devel/git-gitk/Makefile:1.12 Thu Oct 16 08:45:32 2025
+++ pkgsrc/devel/git-gitk/Makefile      Wed Sep 30 10:52:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/10/16 08:45:32 adam Exp $
+# $NetBSD: Makefile,v 1.13 2026/09/30 10:52:58 adam Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (gitk)
@@ -9,10 +9,10 @@ SUPERSEDES+=  scmgit-gitk-[0-9]*
 
 DEPENDS+=      git-base>=1.7.12nb1:../../devel/git-base
 
-BUILD_DIRS=            gitk-git
-MAKE_ENV+=             prefix=${PREFIX}
-TK90WISH=              ${PREFIX}/${TK90_SUBDIR}/bin/wish
-MAKE_ENV+=             TCLTK_PATH=${TK90WISH:Q}
+BUILD_DIRS=    gitk-git
+MAKE_ENV+=     prefix=${PREFIX}
+TK90WISH=      ${PREFIX}/${TK90_SUBDIR}/bin/wish
+MAKE_ENV+=     TCLTK_PATH=${TK90WISH:Q}
 
 CONFIGURE_ARGS+=       --with-tcltk=${TK90WISH:Q}
 
@@ -21,7 +21,7 @@ INSTALLATION_DIRS+=   bin
 .include "../../mk/bsd.prefs.mk"
 
 .if ${USE_CROSS_COMPILE:U:tl} == "yes"
-ALL_ENV+=              gitexecdir=${PREFIX:Q}/libexec/git-core # XXX
+ALL_ENV+=              gitexecdir=${PREFIX}/libexec/git-core   # XXX
 CONFIGURE_ENV.NetBSD+= ac_cv_iconv_omits_bom=no
 CONFIGURE_ENV.NetBSD+= ac_cv_fread_reads_directories=yes
 CONFIGURE_ENV.NetBSD+= ac_cv_snprintf_returns_bogus=no

Index: pkgsrc/devel/git-perlscripts/Makefile
diff -u pkgsrc/devel/git-perlscripts/Makefile:1.13 pkgsrc/devel/git-perlscripts/Makefile:1.14
--- pkgsrc/devel/git-perlscripts/Makefile:1.13  Thu Jul 16 19:01:48 2026
+++ pkgsrc/devel/git-perlscripts/Makefile       Wed Sep 30 10:52:58 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2026/07/16 19:01:48 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2026/09/30 10:52:58 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-perlscripts-${GIT_VERSION}
@@ -8,7 +7,7 @@ COMMENT=        Git commands that rely on Perl
 
 CONFLICTS+=    git-base<2.41.0nb1
 
-DEPENDS+=      git-base-[0-9]*:../../devel/git-base
+DEPENDS+=      git-base>=0:../../devel/git-base
 DEPENDS+=      p5-DBD-SQLite>=0:../../databases/p5-DBD-SQLite
 DEPENDS+=      p5-DBI>=0:../../databases/p5-DBI
 DEPENDS+=      p5-Error>=0.17015:../../devel/p5-Error