From f678b5d3e61eb77f71ccdfdd64ffe3f154cb56ea Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 9 Sep 2022 13:49:46 -0700 Subject: git: Update to 2.37.3 --- pkg/git/.gitignore | 2 +- pkg/git/commands.txt | 2 + pkg/git/config.h | 4 +- pkg/git/configs.txt | 5 +- pkg/git/gen.lua | 7 ++ pkg/git/man.txt | 2 + ...ble-add.interactive.usebuiltin-by-default.patch | 24 ------- ...l-use-awk-instead-of-perl-to-parse-ls-rem.patch | 84 ++++++++++++++++++++++ ...l-use-awk-instead-of-perl-to-parse-ls-rem.patch | 84 ---------------------- pkg/git/sha256 | 2 +- pkg/git/src | 2 +- pkg/git/url | 2 +- pkg/git/ver | 2 +- 13 files changed, 107 insertions(+), 115 deletions(-) delete mode 100644 pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch create mode 100644 pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch delete mode 100644 pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch (limited to 'pkg') diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index 4aff2236..36a5ef18 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.35.1.tar.gz +/git-manpages-2.37.3.tar.gz /man /man.ninja diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt index beb958ae..93772657 100644 --- a/pkg/git/commands.txt +++ b/pkg/git/commands.txt @@ -54,12 +54,14 @@ git-for-each-repo.txt git-format-patch.txt git-fsck-objects.txt git-fsck.txt +git-fsmonitor--daemon.txt git-gc.txt git-get-tar-commit-id.txt git-grep.txt git-gui.txt git-hash-object.txt git-help.txt +git-hook.txt git-http-backend.txt git-http-fetch.txt git-http-push.txt diff --git a/pkg/git/config.h b/pkg/git/config.h index fb92292f..051f4bb5 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -11,12 +11,14 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.35.1" +#define GIT_VERSION "2.37.3" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY #define HAVE_CLOCK_GETTIME #define HAVE_CLOCK_MONOTONIC +#define HAVE_SYNC_FILE_RANGE +#define HAVE_GETRANDOM #define HAVE_GETDELIM #define NO_GETTEXT #define NO_OPENSSL diff --git a/pkg/git/configs.txt b/pkg/git/configs.txt index f8173ef6..963bb146 100644 --- a/pkg/git/configs.txt +++ b/pkg/git/configs.txt @@ -40,6 +40,7 @@ config/help.txt config/http.txt config/i18n.txt config/imap.txt +config/includeif.txt config/index.txt config/init.txt config/instaweb.txt @@ -65,10 +66,12 @@ config/remote.txt config/remotes.txt config/repack.txt config/rerere.txt -config/reset.txt +config/revert.txt +config/safe.txt config/sendemail.txt config/sequencer.txt config/showbranch.txt +config/sparse.txt config/splitindex.txt config/ssh.txt config/stash.txt diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua index 85a897b4..8c3ff989 100644 --- a/pkg/git/gen.lua +++ b/pkg/git/gen.lua @@ -71,6 +71,7 @@ lib('libgit.a', [[ compat/obstack.c compat/regex/regex.c.o compat/terminal.c + compat/zlib-uncompress2.c compat/qsort_s.c config.c connect.c @@ -109,6 +110,8 @@ lib('libgit.a', [[ fmt-merge-msg.c fsck.c fsmonitor.c + fsmonitor-ipc.c + fsmonitor-settings.c gettext.c gpg-interface.c graph.c @@ -161,6 +164,7 @@ lib('libgit.a', [[ pack-bitmap-write.c pack-bitmap.c pack-check.c + pack-mtimes.c pack-objects.c pack-revindex.c pack-write.c @@ -191,6 +195,7 @@ lib('libgit.a', [[ rebase.c ref-filter.c reflog-walk.c + reflog.c refs.c refs/debug.c refs/files-backend.c @@ -346,11 +351,13 @@ local builtins = { 'for-each-ref', 'for-each-repo', 'fsck', + 'fsmonitor--daemon', 'gc', 'get-tar-commit-id', 'grep', 'hash-object', 'help', + 'hook', 'index-pack', 'init-db', 'interpret-trailers', diff --git a/pkg/git/man.txt b/pkg/git/man.txt index b2b3e6a7..d3fe81c2 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -53,12 +53,14 @@ man1/git-for-each-repo.1 man1/git-format-patch.1 man1/git-fsck-objects.1 man1/git-fsck.1 +man1/git-fsmonitor--daemon.1 man1/git-gc.1 man1/git-get-tar-commit-id.1 man1/git-grep.1 man1/git-gui.1 man1/git-hash-object.1 man1/git-help.1 +man1/git-hook.1 man1/git-http-backend.1 man1/git-http-fetch.1 man1/git-http-push.1 diff --git a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch b/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch deleted file mode 100644 index d482f774..00000000 --- a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2dd5d11805fc486ea2d6b83cba568a1282b45286 Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Sat, 27 Jun 2020 01:09:58 -0700 -Subject: [PATCH] Enable add.interactive.usebuiltin by default - ---- - builtin/add.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/builtin/add.c b/builtin/add.c -index ef6b619c45..c2b326abfd 100644 ---- a/builtin/add.c -+++ b/builtin/add.c -@@ -239,6 +239,7 @@ int run_add_interactive(const char *revision, const char *patch_mode, - - if (use_builtin_add_i < 0) { - int experimental; -+ use_builtin_add_i = 1; - if (!git_config_get_bool("add.interactive.usebuiltin", - &use_builtin_add_i)) - ; /* ok */ --- -2.34.0 - 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 new file mode 100644 index 00000000..1ad01d3c --- /dev/null +++ b/pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch @@ -0,0 +1,84 @@ +From 1b87b640fac0fa52de5da8d2c57d038cc0cef5b1 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 + output + +--- + git-request-pull.sh | 48 +++++++++++++++++++++++++++------------------ + 1 file changed, 29 insertions(+), 19 deletions(-) + +diff --git a/git-request-pull.sh b/git-request-pull.sh +index 2d0e44656c..0e3cf644e0 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" + # Find a ref with the same name as $head that exists at the remote + # and points to the same commit as the local object. + find_matching_ref=' +- my ($head,$headrev) = (@ARGV); +- my $pattern = qr{/\Q$head\E$}; +- my ($remote_sha1, $found); ++ function endswith(s, t) { ++ n = length(s) ++ m = length(t) ++ return m <= n && substr(s, n - m + 1) == t ++ } + +- while () { +- chomp; +- my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/; ++ { ++ sha1 = $1 ++ ref = $2 + +- if ($sha1 eq $head) { +- $found = $remote_sha1 = $sha1; +- break; ++ if (sha1 == head) { ++ found = remote_sha1 = sha1 ++ exit + } + +- if ($ref eq $head || $ref =~ $pattern) { +- if ($deref eq "") { ++ deref = index(ref, "^") ++ if (deref) ++ ref = substr(ref, 1, deref - 1) ++ ++ if (ref == head || endswith(ref, "/" head)) { ++ if (!deref) { + # Remember the matching object on the remote side +- $remote_sha1 = $sha1; ++ remote_sha1 = sha1 + } +- if ($sha1 eq $headrev) { +- $found = $ref; +- break; ++ if (sha1 == headrev) { ++ found = ref ++ exit + } + } + } +- if ($found) { +- $remote_sha1 = $headrev if ! defined $remote_sha1; +- print "$remote_sha1 $found\n"; ++ ++ END { ++ if (found) { ++ if (!remote_sha1) ++ remote_sha1 = headrev ++ print remote_sha1 " " found ++ } + } + ' + +-set fnord $(git ls-remote "$url" | @@PERL@@ -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 + diff --git a/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch b/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch deleted file mode 100644 index 1ad01d3c..00000000 --- a/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 1b87b640fac0fa52de5da8d2c57d038cc0cef5b1 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 - output - ---- - git-request-pull.sh | 48 +++++++++++++++++++++++++++------------------ - 1 file changed, 29 insertions(+), 19 deletions(-) - -diff --git a/git-request-pull.sh b/git-request-pull.sh -index 2d0e44656c..0e3cf644e0 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" - # Find a ref with the same name as $head that exists at the remote - # and points to the same commit as the local object. - find_matching_ref=' -- my ($head,$headrev) = (@ARGV); -- my $pattern = qr{/\Q$head\E$}; -- my ($remote_sha1, $found); -+ function endswith(s, t) { -+ n = length(s) -+ m = length(t) -+ return m <= n && substr(s, n - m + 1) == t -+ } - -- while () { -- chomp; -- my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/; -+ { -+ sha1 = $1 -+ ref = $2 - -- if ($sha1 eq $head) { -- $found = $remote_sha1 = $sha1; -- break; -+ if (sha1 == head) { -+ found = remote_sha1 = sha1 -+ exit - } - -- if ($ref eq $head || $ref =~ $pattern) { -- if ($deref eq "") { -+ deref = index(ref, "^") -+ if (deref) -+ ref = substr(ref, 1, deref - 1) -+ -+ if (ref == head || endswith(ref, "/" head)) { -+ if (!deref) { - # Remember the matching object on the remote side -- $remote_sha1 = $sha1; -+ remote_sha1 = sha1 - } -- if ($sha1 eq $headrev) { -- $found = $ref; -- break; -+ if (sha1 == headrev) { -+ found = ref -+ exit - } - } - } -- if ($found) { -- $remote_sha1 = $headrev if ! defined $remote_sha1; -- print "$remote_sha1 $found\n"; -+ -+ END { -+ if (found) { -+ if (!remote_sha1) -+ remote_sha1 = headrev -+ print remote_sha1 " " found -+ } - } - ' - --set fnord $(git ls-remote "$url" | @@PERL@@ -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 - diff --git a/pkg/git/sha256 b/pkg/git/sha256 index ca741f8b..6c6ec6d2 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -d90da8b28fe0088519e0dc3c9f4bc85e429c7d6ccbaadcfe94aed47fb9c95504 git-manpages-2.35.1.tar.gz +ea04396fa3487ee92b0e2f4a1f2339135ba8b741a0c18a2db1c9f435d0a2c05d git-manpages-2.37.3.tar.gz diff --git a/pkg/git/src b/pkg/git/src index 4c53a8c2..ac8035a2 160000 --- a/pkg/git/src +++ b/pkg/git/src @@ -1 +1 @@ -Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a +Subproject commit ac8035a2affdf30f2c691ad760826d955bba0507 diff --git a/pkg/git/url b/pkg/git/url index 591f788f..d3cf1a97 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.35.1.tar.gz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.37.3.tar.gz" diff --git a/pkg/git/ver b/pkg/git/ver index c7b0fab6..daa0ac88 100644 --- a/pkg/git/ver +++ b/pkg/git/ver @@ -1 +1 @@ -2.35.1 r0 +2.37.3 r0 -- cgit v1.2.3