From 236c0c6ce4446adac7a08f4f0604c011a0946659 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 28 Apr 2025 14:15:33 -0700 Subject: git: Update to 2.49.0 --- pkg/git/.gitignore | 2 +- pkg/git/commands.txt | 399 +++++++++++---------- pkg/git/configs.txt | 190 +++++----- pkg/git/gen.lua | 40 ++- pkg/git/man.txt | 3 + ...l-use-awk-instead-of-perl-to-parse-ls-rem.patch | 8 +- pkg/git/sh_gen.sed | 14 +- pkg/git/sha256 | 2 +- pkg/git/src | 2 +- pkg/git/url | 2 +- pkg/git/ver | 2 +- 11 files changed, 343 insertions(+), 321 deletions(-) diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index 74d38a07..6048e97d 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.45.2.tar.gz +/git-manpages-2.49.0.tar.gz /man /man.ninja diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt index 142ba644..f5134a77 100644 --- a/pkg/git/commands.txt +++ b/pkg/git/commands.txt @@ -1,198 +1,201 @@ -# 2,$$OLDPWD/$out') +rule('cmdlist', '$srcdir/generate-cmdlist.sh $srcdir $out') build('cmdlist', '$outdir/command-list.h', { - '$srcdir/command-list.txt', - '|', '$srcdir/generate-cmdlist.sh', expand{'$srcdir/Documentation/', lines('commands.txt')}, + '|', '$srcdir/generate-cmdlist.sh', '$srcdir/command-list.txt', + expand{'$srcdir/Documentation/', lines('commands.txt')}, }) -rule('configlist', 'cd $srcdir && ./generate-configlist.sh >$$OLDPWD/$out') +rule('configlist', '$srcdir/generate-configlist.sh $srcdir $out') build('configlist', '$outdir/config-list.h', { - '|', '$srcdir/generate-configlist.sh', expand{'$srcdir/Documentation/', lines('configs.txt')}, + '|', '$srcdir/generate-configlist.sh', + expand{'$srcdir/Documentation/', lines('configs.txt')}, }) -rule('hooklist', 'cd $srcdir && ./generate-hooklist.sh >$$OLDPWD/$out') +rule('hooklist', '$srcdir/generate-hooklist.sh $srcdir $out') build('hooklist', '$outdir/hook-list.h', { - '|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.txt' + '|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.adoc' +}) + +build('sed', '$outdir/version-def.h', '$srcdir/version-def.h.in', { + expr={ + [[-e 's,@GIT_VERSION@,2.49.0,']], + [[-e 's,@GIT_BUILT_FROM_COMMIT@,,']], + [[-e 's,@GIT_USER_AGENT@,git/2.49.0,']], + }, }) cc('exec-cmd.c', nil, {cflags=string.format([[$cflags '-DFALLBACK_RUNTIME_PREFIX="%s"']], config.prefix)}) @@ -44,14 +54,12 @@ lib('libreftable.a', [[ block.c blocksource.c iter.c - publicbasics.c merged.c pq.c reader.c record.c - refname.c - generic.c stack.c + system.c tree.c writer.c ) @@ -90,12 +98,13 @@ lib('libgit.a', [[ commit-graph.c commit-reach.c commit.c + common-exit.c + common-init.c compat/nonblock.c compat/obstack.c compat/qsort_s.c compat/regex/regex.c.o compat/terminal.c - compat/zlib-uncompress2.c config.c connect.c connected.c @@ -205,6 +214,7 @@ lib('libgit.a', [[ patch-delta.c patch-ids.c path.c + path-walk.c pathspec.c pkt-line.c preload-index.c @@ -216,6 +226,7 @@ lib('libgit.a', [[ protocol.c protocol-caps.c prune-packed.c + pseudo-merge.c quote.c range-diff.c reachable.c @@ -344,6 +355,7 @@ local builtins = { 'annotate', 'apply', 'archive', + 'backfill', 'bisect', 'blame', 'branch', @@ -426,6 +438,7 @@ local builtins = { 'rebase', 'receive-pack', 'reflog', + 'refs', 'remote-ext', 'remote-fd', 'remote', @@ -519,9 +532,8 @@ for _, name in ipairs{'git-receive-pack', 'git-upload-archive', 'git-upload-pack end -- templates -dir('share/git-core/templates/branches', '755') -file('share/git-core/templates/description', '644', '$srcdir/templates/this--description') -file('share/git-core/templates/info/exclude', '644', '$srcdir/templates/info--exclude') +file('share/git-core/templates/description', '644', '$srcdir/templates/description') +file('share/git-core/templates/info/exclude', '644', '$srcdir/templates/info/exclude') -- Skip the sample hooks and install an empty directory instead. dir('share/git-core/templates/hooks', '755') diff --git a/pkg/git/man.txt b/pkg/git/man.txt index 81818d05..ad662d96 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -5,6 +5,7 @@ man1/git-annotate.1 man1/git-apply.1 man1/git-archimport.1 man1/git-archive.1 +man1/git-backfill.1 man1/git-bisect.1 man1/git-blame.1 man1/git-branch.1 @@ -107,6 +108,7 @@ man1/git-read-tree.1 man1/git-rebase.1 man1/git-receive-pack.1 man1/git-reflog.1 +man1/git-refs.1 man1/git-remote-ext.1 man1/git-remote-fd.1 man1/git-remote.1 @@ -189,6 +191,7 @@ man7/giteveryday.7 man7/gitfaq.7 man7/gitglossary.7 man7/gitnamespaces.7 +man7/gitpacking.7 man7/gitremote-helpers.7 man7/gitrevisions.7 man7/gitsubmodules.7 diff --git a/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch b/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch index 1ad01d3c..2a4c95c0 100644 --- a/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch +++ b/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch @@ -1,4 +1,4 @@ -From 1b87b640fac0fa52de5da8d2c57d038cc0cef5b1 Mon Sep 17 00:00:00 2001 +From 742272838f08fa1b9fe47ef842253ac84a502ee7 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Tue, 16 Mar 2021 17:21:31 -0700 Subject: [PATCH] request-pull: use awk instead of perl to parse ls-remote @@ -9,7 +9,7 @@ Subject: [PATCH] request-pull: use awk instead of perl to parse ls-remote 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/git-request-pull.sh b/git-request-pull.sh -index 2d0e44656c..0e3cf644e0 100755 +index 775ba8ea11..a7177c5e1c 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -82,37 +82,47 @@ die "fatal: No commits in common between $base and $head" @@ -74,11 +74,11 @@ index 2d0e44656c..0e3cf644e0 100755 } ' --set fnord $(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev") +-set fnord $(git ls-remote "$url" | @PERL_PATH@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev") +set fnord $(git ls-remote "$url" | awk -v "head=${remote:-HEAD}" -v "headrev=$headrev" "$find_matching_ref") remote_sha1=$2 ref=$3 -- -2.34.0 +2.45.2 diff --git a/pkg/git/sh_gen.sed b/pkg/git/sh_gen.sed index 8cb88f96..4cef36c7 100644 --- a/pkg/git/sh_gen.sed +++ b/pkg/git/sh_gen.sed @@ -1,8 +1,8 @@ s|@SHELL_PATH@|/bin/sh| -s|@@DIFF@@|diff| -s|@@LOCALEDIR@@|/share/locale|g -s|@@USE_GETTEXT_SCHEME@@||g -/^\# @@BROKEN_PATH_FIX@@$/d -s|@@GITWEBDIR@@|/share/gitweb|g -s|@@PERL@@|/bin/perl|g -s|@@PAGER_ENV@@|LESS=FRX LV=-c|g +s|@DIFF@|diff| +s|@LOCALEDIR@|/share/locale|g +s|@USE_GETTEXT_SCHEME@||g +/^\# @BROKEN_PATH_FIX@$/d +s|@GITWEBDIR@|/share/gitweb|g +s|@PERL_PATH@|/bin/perl|g +s|@PAGER_ENV@|LESS=FRX LV=-c|g diff --git a/pkg/git/sha256 b/pkg/git/sha256 index b01f1786..9ada844c 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -48c1e2e3ecbb2ce9faa020a19fcdbc6ce64ea25692111b5930686bc0bb4f0e7f git-manpages-2.45.2.tar.gz +b561252841ead1e32d87dbec8f257399ea08f759c98df62c3bafa5a658f2f8ac git-manpages-2.49.0.tar.gz diff --git a/pkg/git/src b/pkg/git/src index bea9ecd2..683c54c9 160000 --- a/pkg/git/src +++ b/pkg/git/src @@ -1 +1 @@ -Subproject commit bea9ecd24b0c3bf06cab4a851694fe09e7e51408 +Subproject commit 683c54c999c301c2cd6f715c411407c413b1d84e diff --git a/pkg/git/url b/pkg/git/url index 694d647f..6555a29b 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.45.2.tar.gz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.49.0.tar.gz" diff --git a/pkg/git/ver b/pkg/git/ver index adafa967..a7dac93f 100644 --- a/pkg/git/ver +++ b/pkg/git/ver @@ -1 +1 @@ -2.45.2 r0 +2.49.0 r0 -- cgit v1.2.3