oasis

commit: 85ac5c8eb7ffce5e720d6cc594109555ce36071f
parent 0e57a5de27f143751703d683a4629050ae599628
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 22 Mar 2020 18:42:25 -0700

git: Update to 2.26.0

Diffstat:
M
pkg/git/.gitignore
2
+-
M
pkg/git/config.h
2
+-
M
pkg/git/gen.lua
1
+
M
pkg/git/man.txt
2
+-
M
pkg/git/sha256
2
+-
M
pkg/git/url
2
+-
M
pkg/git/ver
2
+-

7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.25.2.tar.xz
+/git-manpages-2.26.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.25.2"
+#define GIT_VERSION "2.26.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
@@ -154,6 +154,7 @@ lib('libgit.a', [[
 	range-diff.c
 	reachable.c
 	read-cache.c
+	rebase.c
 	rebase-interactive.c
 	ref-filter.c
 	reflog-walk.c
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.25.2.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.26.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/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-78bbe92b0c7c2f9a227025a7b7207951c185adda38a968499e5b6dacb6e1d41a  git-manpages-2.25.2.tar.xz
+387e46a0b67c148be7ef80759b1930a3b64ac77782630c18afc784f35ed93426  git-manpages-2.26.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.25.2.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.0.tar.xz"
diff --git a/pkg/git/ver b/pkg/git/ver
@@ -1 +1 @@
-2.25.2 r0
+2.26.0 r0