commit: 1bd3598ce4fd41e984649034df12e6828e1bed0c
parent f8cea8cf73bfbb961668f66e3cd037232ebb3340
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 1 Jun 2020 19:48:49 -0700
git: Update to 2.27.0
Diffstat:
8 files changed, 129 insertions(+), 111 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.26.2.tar.gz
+/git-manpages-2.27.0.tar.gz
/man
/man.ninja
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
@@ -1,4 +1,4 @@
-# 2,<cd src/Documentation && printf '%s\n' git*.txt *config.txt config/*.txt
+# 2,<cd src/Documentation && printf '%s\n' git*.txt
git-add.txt
git-am.txt
git-annotate.txt
@@ -9,6 +9,7 @@ git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt
git-branch.txt
+git-bugreport.txt
git-bundle.txt
git-cat-file.txt
git-check-attr.txt
@@ -161,6 +162,7 @@ gitcredentials.txt
gitcvs-migration.txt
gitdiffcore.txt
giteveryday.txt
+gitfaq.txt
gitglossary.txt
githooks.txt
gitignore.txt
@@ -176,83 +178,3 @@ gittutorial.txt
gitweb.conf.txt
gitweb.txt
gitworkflows.txt
-config.txt
-git-config.txt
-config/add.txt
-config/advice.txt
-config/alias.txt
-config/am.txt
-config/apply.txt
-config/blame.txt
-config/branch.txt
-config/browser.txt
-config/checkout.txt
-config/clean.txt
-config/color.txt
-config/column.txt
-config/commit.txt
-config/completion.txt
-config/core.txt
-config/credential.txt
-config/diff.txt
-config/difftool.txt
-config/fastimport.txt
-config/feature.txt
-config/fetch.txt
-config/filter.txt
-config/fmt-merge-msg.txt
-config/format.txt
-config/fsck.txt
-config/gc.txt
-config/gitcvs.txt
-config/gitweb.txt
-config/gpg.txt
-config/grep.txt
-config/gui.txt
-config/guitool.txt
-config/help.txt
-config/http.txt
-config/i18n.txt
-config/imap.txt
-config/index.txt
-config/init.txt
-config/instaweb.txt
-config/interactive.txt
-config/log.txt
-config/mailinfo.txt
-config/mailmap.txt
-config/man.txt
-config/merge.txt
-config/mergetool.txt
-config/notes.txt
-config/pack.txt
-config/pager.txt
-config/pretty.txt
-config/protocol.txt
-config/pull.txt
-config/push.txt
-config/rebase.txt
-config/receive.txt
-config/remote.txt
-config/remotes.txt
-config/repack.txt
-config/rerere.txt
-config/reset.txt
-config/sendemail.txt
-config/sequencer.txt
-config/showbranch.txt
-config/splitindex.txt
-config/ssh.txt
-config/stash.txt
-config/status.txt
-config/submodule.txt
-config/tag.txt
-config/trace2.txt
-config/transfer.txt
-config/uploadarchive.txt
-config/uploadpack.txt
-config/url.txt
-config/user.txt
-config/versionsort.txt
-config/web.txt
-config/worktree.txt
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.26.2"
+#define GIT_VERSION "2.27.0"
#define HAVE_ALLOCA_H
#define HAVE_PATHS_H
#define HAVE_DEV_TTY
diff --git a/pkg/git/configs.txt b/pkg/git/configs.txt
@@ -0,0 +1,82 @@
+# 2,<cd src/Documentation && printf '%s\n' *config.txt config/*.txt
+config.txt
+git-config.txt
+config/add.txt
+config/advice.txt
+config/alias.txt
+config/am.txt
+config/apply.txt
+config/blame.txt
+config/branch.txt
+config/browser.txt
+config/checkout.txt
+config/clean.txt
+config/color.txt
+config/column.txt
+config/commit.txt
+config/completion.txt
+config/core.txt
+config/credential.txt
+config/diff.txt
+config/difftool.txt
+config/fastimport.txt
+config/feature.txt
+config/fetch.txt
+config/filter.txt
+config/fmt-merge-msg.txt
+config/format.txt
+config/fsck.txt
+config/gc.txt
+config/gitcvs.txt
+config/gitweb.txt
+config/gpg.txt
+config/grep.txt
+config/gui.txt
+config/guitool.txt
+config/help.txt
+config/http.txt
+config/i18n.txt
+config/imap.txt
+config/index.txt
+config/init.txt
+config/instaweb.txt
+config/interactive.txt
+config/log.txt
+config/mailinfo.txt
+config/mailmap.txt
+config/man.txt
+config/merge.txt
+config/mergetool.txt
+config/notes.txt
+config/pack.txt
+config/pager.txt
+config/pretty.txt
+config/protocol.txt
+config/pull.txt
+config/push.txt
+config/rebase.txt
+config/receive.txt
+config/remote.txt
+config/remotes.txt
+config/repack.txt
+config/rerere.txt
+config/reset.txt
+config/sendemail.txt
+config/sequencer.txt
+config/showbranch.txt
+config/splitindex.txt
+config/ssh.txt
+config/stash.txt
+config/status.txt
+config/submodule.txt
+config/tag.txt
+config/tar.txt
+config/trace2.txt
+config/transfer.txt
+config/uploadarchive.txt
+config/uploadpack.txt
+config/url.txt
+config/user.txt
+config/versionsort.txt
+config/web.txt
+config/worktree.txt
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
@@ -7,12 +7,22 @@ cflags{
'-I $builddir/pkg/zlib/include',
}
+pkg.deps = {
+ '$outdir/config-list.h',
+ '$outdir/command-list.h',
+ 'pkg/curl/headers',
+ 'pkg/zlib/headers',
+}
+
rule('cmdlist', 'cd $srcdir && ./generate-cmdlist.sh $$OLDPWD/$in >$$OLDPWD/$out')
build('cmdlist', '$outdir/command-list.h', {
'$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('commands.txt')},
})
-pkg.deps = {'$outdir/command-list.h', 'pkg/curl/headers', 'pkg/zlib/headers'}
+rule('configlist', 'cd $srcdir && ./generate-configlist.sh $$OLDPWD/$in >$$OLDPWD/$out')
+build('configlist', '$outdir/config-list.h', {
+ '$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('configs.txt')},
+})
cc('exec-cmd.c', nil, {cflags=[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""']]})
cc('common-main.c')
@@ -37,6 +47,7 @@ lib('libgit.a', [[
bisect.c
blame.c
blob.c
+ bloom.c
branch.c
bulk-checkin.c
bundle.c
@@ -46,9 +57,9 @@ lib('libgit.a', [[
color.c
column.c
combine-diff.c
- commit.c
commit-graph.c
commit-reach.c
+ commit.c
compat/obstack.c
compat/regex/regex.c.o
compat/terminal.c
@@ -64,17 +75,17 @@ lib('libgit.a', [[
date.c
decorate.c
delta-islands.c
- diff-delta.c
- diff-lib.c
- diff-no-index.c
- diff.c
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
- dir.c
+ diff-delta.c
+ diff-lib.c
+ diff-no-index.c
+ diff.c
dir-iterator.c
+ dir.c
editor.c
entry.c
environment.c
@@ -85,6 +96,7 @@ lib('libgit.a', [[
exec-cmd.c.o
fetch-negotiator.c
fetch-pack.c
+ fmt-merge-msg.c
fsck.c
fsmonitor.c
gettext.c
@@ -92,7 +104,6 @@ lib('libgit.a', [[
graph.c
grep.c
hashmap.c
- linear-assignment.c
help.c
hex.c
ident.c
@@ -102,9 +113,10 @@ lib('libgit.a', [[
levenshtein.c
line-log.c
line-range.c
- list-objects.c
- list-objects-filter.c
+ linear-assignment.c
list-objects-filter-options.c
+ list-objects-filter.c
+ list-objects.c
ll-merge.c
lockfile.c
log-tree.c
@@ -113,9 +125,9 @@ lib('libgit.a', [[
mailmap.c
match-trees.c
mem-pool.c
+ merge.c
merge-blobs.c
merge-recursive.c
- merge.c
mergesort.c
midx.c
name-hash.c
@@ -126,15 +138,16 @@ lib('libgit.a', [[
notes-utils.c
notes.c
object.c
+ oid-array.c
oidmap.c
oidset.c
- packfile.c
pack-bitmap-write.c
pack-bitmap.c
pack-check.c
pack-objects.c
pack-revindex.c
pack-write.c
+ packfile.c
pager.c
parse-options-cb.c
parse-options.c
@@ -150,12 +163,13 @@ lib('libgit.a', [[
promisor-remote.c
prompt.c
protocol.c
+ prune-packed.c
quote.c
range-diff.c
reachable.c
read-cache.c
- rebase.c
rebase-interactive.c
+ rebase.c
ref-filter.c
reflog-walk.c
refs.c
@@ -169,6 +183,7 @@ lib('libgit.a', [[
repo-settings.c
repository.c
rerere.c
+ reset.c
resolve-undo.c
revision.c
run-command.c
@@ -177,9 +192,8 @@ lib('libgit.a', [[
serve.c
server-info.c
setup.c
- sha1-array.c
- sha1-lookup.c
sha1-file.c
+ sha1-lookup.c
sha1-name.c
shallow.c
sideband.c
@@ -189,9 +203,9 @@ lib('libgit.a', [[
strbuf.c
streaming.c
string-list.c
+ sub-process.c
submodule-config.c
submodule.c
- sub-process.c
symlinks.c
tag.c
tempfile.c
@@ -250,12 +264,12 @@ lib('libgit.a', [[
-- src/Makefile:/^XDIFF_OBJS.\+=
lib('libxdiff.a', [[xdiff/(
xdiffi.c
- xprepare.c
- xutils.c
xemit.c
+ xhistogram.c
xmerge.c
xpatience.c
- xhistogram.c
+ xprepare.c
+ xutils.c
)]])
-- src/Makefile:/^BUILTIN_OBJS.\+=
@@ -279,9 +293,9 @@ local builtins = {
'clean',
'clone',
'column',
+ 'commit-graph',
'commit-tree',
'commit',
- 'commit-graph',
'config',
'count-objects',
'credential',
@@ -312,13 +326,13 @@ local builtins = {
'ls-tree',
'mailinfo',
'mailsplit',
- 'merge',
'merge-base',
'merge-file',
'merge-index',
'merge-ours',
'merge-recursive',
'merge-tree',
+ 'merge',
'mktag',
'mktree',
'multi-pack-index',
@@ -338,9 +352,9 @@ local builtins = {
'rebase',
'receive-pack',
'reflog',
- 'remote',
'remote-ext',
'remote-fd',
+ 'remote',
'repack',
'replace',
'rerere',
@@ -397,14 +411,15 @@ end
local programs = {
-- src/Makefile:/^PROGRAM_OBJS./+=
+ {'bugreport'},
{'credential-store'},
{'daemon'},
{'fast-import'},
{'http-backend'},
{'imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/curl/libcurl.a.d'}},
+ -- git-remote-testsvn is intentionally omitted
{'sh-i18n--envsubst'},
{'shell'},
- -- git-remote-testsvn is intentionally omitted
{'remote-http', {'remote-curl.c', 'http.c.o', 'http-walker.c', '$builddir/pkg/curl/libcurl.a.d'}},
}
@@ -429,7 +444,6 @@ local scripts = {
{'merge-resolve', '755'},
{'mergetool', '755'},
{'quiltimport', '755'},
- {'legacy-stash', '755'},
{'request-pull', '755'},
{'submodule', '755'},
{'web--browse', '755'},
@@ -438,8 +452,8 @@ local scripts = {
{'mergetool--lib', '644'},
{'parse-remote', '644'},
{'rebase--preserve-merges', '644'},
- {'sh-setup', '644'},
{'sh-i18n', '644'},
+ {'sh-setup', '644'},
}
rule('sh_gen', 'sed -f $dir/sh_gen.sed $in >$out')
diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-b3c6cfc980f3c593d0cd0c63e0c97d6f1cafe7b72321fc3a94948758b9529c5b git-manpages-2.26.2.tar.gz
+414e4b17133e54d846f6bfa2479f9757c50e16c013eb76167a492ae5409b8947 git-manpages-2.27.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.26.2.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.27.0.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
@@ -1 +1 @@
-2.26.2 r0
+2.27.0 r0
