commit: fbac4cfd560fd83899f9c4f4c7b7b957d9947413
parent 9a2e3a87420a5eef5391794fb19881561d89d285
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 10 Jun 2019 00:50:00 -0700
git: Update to 2.22.0
Diffstat:
8 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.21.0.tar.xz
+/git-manpages-2.22.0.tar.xz
/man
/man.ninja
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
@@ -105,7 +105,6 @@ git-receive-pack.txt
git-reflog.txt
git-remote-ext.txt
git-remote-fd.txt
-git-remote-testgit.txt
git-remote.txt
git-repack.txt
git-replace.txt
@@ -244,6 +243,7 @@ config/stash.txt
config/status.txt
config/submodule.txt
config/tag.txt
+config/trace2.txt
config/transfer.txt
config/uploadarchive.txt
config/uploadpack.txt
diff --git a/pkg/git/config.h b/pkg/git/config.h
@@ -3,7 +3,7 @@
#define DEFAULT_PAGER ""
#define ETC_GITATTRIBUTES "/etc/gitattributes"
#define ETC_GITCONFIG "/etc/gitconfig"
-#define GIT_BUILT_FROM_COMMIT "0d0ac3826a3bbb9247e39e12623bbcfdd722f24c"
+#define GIT_BUILT_FROM_COMMIT "b697d92f56511e804b8ba20ccbe7bdc85dc66810"
#define GIT_EXEC_PATH "libexec/git-core"
#define GIT_HOST_CPU "unknown"
#define GIT_HTML_PATH "share/doc/git-doc"
@@ -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.21.0"
+#define GIT_VERSION "2.22.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
@@ -193,6 +193,19 @@ lib('libgit.a', [[
thread-utils.c
tmp-objdir.c
trace.c
+ trace2.c
+ trace2/(
+ tr2_cfg.c
+ tr2_cmd_name.c
+ tr2_dst.c
+ tr2_sid.c
+ tr2_sysenv.c
+ tr2_tbuf.c
+ tr2_tgt_event.c
+ tr2_tgt_normal.c
+ tr2_tgt_perf.c
+ tr2_tls.c
+ )
trailer.c
transport-helper.c
transport.c
@@ -317,7 +330,6 @@ local builtins = {
'range-diff',
'read-tree',
'rebase',
- 'rebase--interactive',
'receive-pack',
'reflog',
'remote',
@@ -332,11 +344,11 @@ local builtins = {
'revert',
'rm',
'send-pack',
- 'serve',
'shortlog',
'show-branch',
'show-index',
'show-ref',
+ 'stash',
'stripspace',
'submodule--helper',
'symbolic-ref',
@@ -409,10 +421,8 @@ x('merge-one-file', '755')
x('merge-resolve', '755')
x('mergetool', '755')
x('quiltimport', '755')
-x('legacy-rebase', '755')
-x('remote-testgit', '755')
+x('legacy-stash', '755')
x('request-pull', '755')
-x('stash', '755')
x('submodule', '755')
x('web--browse', '755')
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.21.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.22.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
man1/git-add.1
man1/git-am.1
man1/git-annotate.1
@@ -104,7 +104,6 @@ man1/git-receive-pack.1
man1/git-reflog.1
man1/git-remote-ext.1
man1/git-remote-fd.1
-man1/git-remote-testgit.1
man1/git-remote.1
man1/git-repack.1
man1/git-replace.1
@@ -151,7 +150,6 @@ man1/git-worktree.1
man1/git-write-tree.1
man1/git.1
man1/gitk.1
-man1/gitremote-helpers.1
man1/gitweb.1
man5/gitattributes.5
man5/githooks.5
@@ -167,6 +165,7 @@ man7/gitdiffcore.7
man7/giteveryday.7
man7/gitglossary.7
man7/gitnamespaces.7
+man7/gitremote-helpers.7
man7/gitrevisions.7
man7/gitsubmodules.7
man7/gittutorial-2.7
diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51 git-manpages-2.21.0.tar.xz
+4e2cfda33d8e86812bfcdb907478d1144412ce472c32edd0219b3c0201c7ee3a git-manpages-2.22.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.21.0.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.22.0.tar.xz"
diff --git a/pkg/git/ver b/pkg/git/ver
@@ -1 +1 @@
-2.21.0 r0
+2.22.0 r0
