logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 51271646aec123f7df70c9f89d574a05a1930fb9
parent 19e535cc3a447ba8cea23efd4463ad5ef1879735
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 10 Apr 2018 10:45:51 -0700

git: Update to 2.17.0

Diffstat:

Mpkg/git/.gitignore2+-
Mpkg/git/config.h2+-
Mpkg/git/gen.lua2+-
Mpkg/git/man.txt2+-
Mpkg/git/rev2+-
Mpkg/git/sha2562+-
Mpkg/git/url2+-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.16.3.tar.xz +/git-manpages-2.17.0.tar.xz /man /man.ninja 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.16.3" +#define GIT_VERSION "2.17.0" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua @@ -77,6 +77,7 @@ lib('libgit.a', [[ ewah/ewah_io.c ewah/ewah_rlw.c exec_cmd.c.o + fetch-object.c fetch-pack.c fsck.c fsmonitor.c @@ -105,7 +106,6 @@ lib('libgit.a', [[ merge-recursive.c merge.c mergesort.c - mru.c name-hash.c notes-cache.c notes-merge.c diff --git a/pkg/git/man.txt b/pkg/git/man.txt @@ -1,4 +1,4 @@ -# 2,<xzcat git-manpages-2.16.1.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort +# 2,<xzcat git-manpages-2.17.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 @@ -29 +30 diff --git a/pkg/git/sha256 b/pkg/git/sha256 @@ -1 +1 @@ -5f61897e681d5144bd70babf760345637e879a8b6e40ca6f0b76b53554649395 git-manpages-2.16.3.tar.xz +4bdab1aed88ad7a12a766de8e03047eba5afbba9874c7effa5059e5481943727 git-manpages-2.17.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.16.3.tar.xz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.17.0.tar.xz"