logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 6529d7d216a4a24499bb0c1f0184fe608e724edb
parent 7fac148261b828a15b57ee89ff409671aa47c953
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 26 Jun 2021 23:58:34 -0700

git: Update to 2.32.0

Diffstat:

Mpkg/git/.gitignore2+-
Mpkg/git/commands.txt1+
Mpkg/git/config.h3++-
Mpkg/git/configs.txt1+
Mpkg/git/gen.lua7+++++++
Mpkg/git/man.txt1+
Mpkg/git/sha2562+-
Mpkg/git/url2+-
8 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.31.1.tar.gz +/git-manpages-2.32.0.tar.gz /man /man.ninja diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt @@ -168,6 +168,7 @@ gitglossary.txt githooks.txt gitignore.txt gitk.txt +gitmailmap.txt gitmodules.txt gitnamespaces.txt gitremote-helpers.txt diff --git a/pkg/git/config.h b/pkg/git/config.h @@ -11,7 +11,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.31.1" +#define GIT_VERSION "2.32.0" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY @@ -21,6 +21,7 @@ #define NO_GETTEXT #define NO_OPENSSL #define NO_SYS_POLL_H +#define SUPPORTS_SIMPLE_IPC #define PAGER_ENV "LESS=FRX LV=-c" #define USE_CURL_FOR_IMAP_SEND diff --git a/pkg/git/configs.txt b/pkg/git/configs.txt @@ -45,6 +45,7 @@ config/init.txt config/instaweb.txt config/interactive.txt config/log.txt +config/lsrefs.txt config/mailinfo.txt config/mailmap.txt config/maintenance.txt diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua @@ -156,6 +156,7 @@ lib('libgit.a', [[ pack-write.c packfile.c pager.c + parallel-checkout.c parse-options-cb.c parse-options.c patch-delta.c @@ -170,6 +171,7 @@ lib('libgit.a', [[ promisor-remote.c prompt.c protocol.c + protocol-caps.c prune-packed.c quote.c range-diff.c @@ -203,6 +205,7 @@ lib('libgit.a', [[ shallow.c sideband.c sigchain.c + sparse-index.c split-index.c stable-qsort.c strbuf.c @@ -259,6 +262,9 @@ lib('libgit.a', [[ zlib.c unix-socket.c + unix-stream-server.c + + compat/simple-ipc/(ipc-shared.c ipc-unix-socket.c) sha1dc_git.c sha1dc/sha1.c @@ -299,6 +305,7 @@ local builtins = { 'check-mailmap', 'check-ref-format', 'checkout-index', + 'checkout--worker', 'checkout', 'clean', 'clone', diff --git a/pkg/git/man.txt b/pkg/git/man.txt @@ -159,6 +159,7 @@ man1/gitweb.1 man5/gitattributes.5 man5/githooks.5 man5/gitignore.5 +man5/gitmailmap.5 man5/gitmodules.5 man5/gitrepository-layout.5 man5/gitweb.conf.5 diff --git a/pkg/git/sha256 b/pkg/git/sha256 @@ -1 +1 @@ -d330498aaaea6928b0abbbbb896f6f605efd8d35f23cbbb2de38c87a737d4543 git-manpages-2.31.1.tar.gz +b5533c40ea1688231c0e2df51cc0d1c0272e17fe78a45ba6e60cb8f61fa4a53c git-manpages-2.32.0.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.31.1.tar.gz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.gz"