oasis

commit: 92131b32c3ad420c254def43f3016c4c806838b3
parent 0d868eacaca4c2a920f5eff5cebe4d41aa6ad7fe
Author: Michael Forney <mforney@mforney.org>
Date:   Thu,  7 Jan 2021 15:10:02 -0800

git: Update to 2.30.0

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

7 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.29.2.tar.gz
+/git-manpages-2.30.0.tar.gz
 /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.29.2"
+#define GIT_VERSION "2.30.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
@@ -125,6 +125,8 @@ lib('libgit.a', [[
 	mem-pool.c
 	merge.c
 	merge-blobs.c
+	merge-ort.c
+	merge-ort-wrappers.c
 	merge-recursive.c
 	mergesort.c
 	midx.c
@@ -203,6 +205,7 @@ lib('libgit.a', [[
 	strbuf.c
 	streaming.c
 	string-list.c
+	strmap.c
 	strvec.c
 	sub-process.c
 	submodule-config.c
@@ -319,6 +322,7 @@ local builtins = {
 	'fetch',
 	'fmt-merge-msg',
 	'for-each-ref',
+	'for-each-repo',
 	'fsck',
 	'gc',
 	'get-tar-commit-id',
@@ -436,7 +440,6 @@ local scripts = {
 
 	-- src/Makefile:/^SCRIPT_LIB.\+=
 	{'mergetool--lib', '644'},
-	{'parse-remote', '644'},
 	{'rebase--preserve-merges', '644'},
 	{'sh-i18n', '644'},
 	{'sh-setup', '644'},
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
@@ -49,6 +49,7 @@ man1/git-fetch.1
 man1/git-filter-branch.1
 man1/git-fmt-merge-msg.1
 man1/git-for-each-ref.1
+man1/git-for-each-repo.1
 man1/git-format-patch.1
 man1/git-fsck-objects.1
 man1/git-fsck.1
@@ -73,6 +74,7 @@ man1/git-ls-remote.1
 man1/git-ls-tree.1
 man1/git-mailinfo.1
 man1/git-mailsplit.1
+man1/git-maintenance.1
 man1/git-merge-base.1
 man1/git-merge-file.1
 man1/git-merge-index.1
@@ -91,7 +93,6 @@ man1/git-p4.1
 man1/git-pack-objects.1
 man1/git-pack-redundant.1
 man1/git-pack-refs.1
-man1/git-parse-remote.1
 man1/git-patch-id.1
 man1/git-prune-packed.1
 man1/git-prune.1
diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-68b258e6d590cb78e02c0df741bbaeab94cbbac6d25de9da4fb3882ee098307b  git-manpages-2.29.2.tar.gz
+e23035ae232c9a5eda57db258bc3b7f1c1060cfd66920f92c7d388b6439773a6  git-manpages-2.30.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.29.2.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.0.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
@@ -1 +1 @@
-2.29.2 r0
+2.30.0 r0