logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: f678b5d3e61eb77f71ccdfdd64ffe3f154cb56ea
parent 63490ce27818d1b7985d851fb1ee19eaa4d71f37
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  9 Sep 2022 13:49:46 -0700

git: Update to 2.37.3

Diffstat:

Mpkg/git/.gitignore2+-
Mpkg/git/commands.txt2++
Mpkg/git/config.h4+++-
Mpkg/git/configs.txt5++++-
Mpkg/git/gen.lua7+++++++
Mpkg/git/man.txt2++
Dpkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch24------------------------
Rpkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch -> pkg/git/patch/0001-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch0
Mpkg/git/sha2562+-
Mpkg/git/url2+-
Mpkg/git/ver2+-
11 files changed, 22 insertions(+), 30 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -1,24 +0,0 @@ -From 2dd5d11805fc486ea2d6b83cba568a1282b45286 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -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/0002-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 diff --git 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/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 @@ -1 +1 @@ -2.35.1 r0 +2.37.3 r0