logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 9d60aac00d4c1d1df952763e51d1b34c032e1564
parent b253572d27494f73dc7517918be17d3f6579fd92
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 18 Jan 2018 10:54:39 -0800

git: Update to 2.16.0

Diffstat:

Mpkg/git/.gitignore2+-
Mpkg/git/config.h8+++++---
Mpkg/git/gen.lua5+++++
Mpkg/git/man.txt2+-
Mpkg/git/rev2+-
Mpkg/git/sha2562+-
Mpkg/git/url2+-
7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.15.1.tar.xz +/git-manpages-2.16.0.tar.xz /man /man.ninja diff --git a/pkg/git/config.h b/pkg/git/config.h @@ -3,16 +3,18 @@ #define DEFAULT_PAGER "" #define ETC_GITATTRIBUTES "/etc/gitattributes" #define ETC_GITCONFIG "/etc/gitconfig" +#define GIT_BUILT_FROM_COMMIT "2512f15446149235156528dafbe75930c712b29e" #define GIT_EXEC_PATH "libexec/git-core" +#define GIT_HOST_CPU "unknown" #define GIT_HTML_PATH "share/doc/git-doc" #define GIT_INFO_PATH "share/info" #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.15.1" -#define PAGER_ENV "LESS=FRX LV=-c" -#define NO_SYS_POLL_H +#define GIT_VERSION "2.16.0" #define NO_OPENSSL +#define NO_SYS_POLL_H +#define PAGER_ENV "LESS=FRX LV=-c" #define USE_CURL_FOR_IMAP_SEND #define SHA1_DC diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua @@ -39,6 +39,7 @@ lib('libgit.a', [[ bulk-checkin.c bundle.c cache-tree.c + checkout.c color.c column.c combine-diff.c @@ -78,6 +79,7 @@ lib('libgit.a', [[ exec_cmd.c.o fetch-pack.c fsck.c + fsmonitor.c gettext.c gpg-interface.c graph.c @@ -91,6 +93,8 @@ lib('libgit.a', [[ line-log.c line-range.c list-objects.c + list-objects-filter.c + list-objects-filter-options.c ll-merge.c lockfile.c log-tree.c @@ -130,6 +134,7 @@ lib('libgit.a', [[ prio-queue.c progress.c prompt.c + protocol.c quote.c reachable.c read-cache.c diff --git a/pkg/git/man.txt b/pkg/git/man.txt @@ -1,4 +1,4 @@ -# 2,<xzcat git-manpages-2.15.1.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort +# 2,<xzcat git-manpages-2.16.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort man1/git-add.1 man1/git-am.1 man1/git-annotate.1 diff --git a/pkg/git/rev b/pkg/git/rev @@ -1 +1 @@ -25 +26 diff --git a/pkg/git/sha256 b/pkg/git/sha256 @@ -1 +1 @@ -6c6bcf7d53aec8a498a1f5af558ae8f83daf892c3565188ee81ce34f6f022656 git-manpages-2.15.1.tar.xz +894224a6eb67dd00bec8dcf83f357b03d5aec351c29a8d62de030be778dcab4c git-manpages-2.16.0.tar.xz diff --git a/pkg/git/url b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.15.1.tar.xz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.16.0.tar.xz"