commit: ba3f7c7d468aa885f295e0072cccf7b905f12d4d
parent 92111294099ac968bfcf482981bd2b707a5eb444
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 9 Jul 2018 14:10:15 -0700
git: Update to 2.18.0
Diffstat:
8 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.17.0.tar.xz
+/git-manpages-2.18.0.tar.xz
/man
/man.ninja
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
@@ -23,6 +23,7 @@ git-citool.txt
git-clean.txt
git-clone.txt
git-column.txt
+git-commit-graph.txt
git-commit-tree.txt
git-commit.txt
git-config.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.17.0"
+#define GIT_VERSION "2.18.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
@@ -8,13 +8,13 @@ cflags{
}
rule('cmdlist', 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out')
-build('cmdlist', '$outdir/common-cmds.h', {
+build('cmdlist', '$outdir/command-list.h', {
'$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('commands.txt')},
})
-pkg.deps = {'$outdir/common-cmds.h', 'pkg/curl/headers', 'pkg/zlib/headers'}
+pkg.deps = {'$outdir/command-list.h', 'pkg/curl/headers', 'pkg/zlib/headers'}
-cc('exec_cmd.c', nil, {cflags=[[$cflags '-DPREFIX=""']]})
+cc('exec-cmd.c', nil, {cflags=[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""']]})
cc('common-main.c')
cc('http.c')
cc('compat/regex/regex.c', nil, {cflags='$cflags -DGAWK -DNO_MBSUPPORT'})
@@ -39,11 +39,13 @@ lib('libgit.a', [[
bulk-checkin.c
bundle.c
cache-tree.c
+ chdir-notify.c
checkout.c
color.c
column.c
combine-diff.c
commit.c
+ commit-graph.c
compat/obstack.c
compat/regex/regex.c.o
compat/terminal.c
@@ -76,7 +78,7 @@ lib('libgit.a', [[
ewah/ewah_bitmap.c
ewah/ewah_io.c
ewah/ewah_rlw.c
- exec_cmd.c.o
+ exec-cmd.c.o
fetch-object.c
fetch-pack.c
fsck.c
@@ -99,9 +101,11 @@ lib('libgit.a', [[
ll-merge.c
lockfile.c
log-tree.c
+ ls-refs.c
mailinfo.c
mailmap.c
match-trees.c
+ mem-pool.c
merge-blobs.c
merge-recursive.c
merge.c
@@ -145,8 +149,9 @@ lib('libgit.a', [[
refs/iterator.c
refs/packed-backend.c
refs/ref-cache.c
+ refspec.c
remote.c
- replace_object.c
+ replace-object.c
repository.c
rerere.c
resolve-undo.c
@@ -154,12 +159,13 @@ lib('libgit.a', [[
run-command.c
send-pack.c
sequencer.c
+ serve.c
server-info.c
setup.c
sha1-array.c
sha1-lookup.c
- sha1_file.c
- sha1_name.c
+ sha1-file.c
+ sha1-name.c
shallow.c
sideband.c
sigchain.c
@@ -182,6 +188,7 @@ lib('libgit.a', [[
tree-walk.c
tree.c
unpack-trees.c
+ upload-pack.c
url.c
urlmatch.c
usage.c
@@ -194,7 +201,7 @@ lib('libgit.a', [[
wildmatch.c
worktree.c
wrapper.c
- write_or_die.c
+ write-or-die.c
ws.c
wt-status.c
xdiff-interface.c
@@ -243,6 +250,7 @@ local builtins = {
'column',
'commit-tree',
'commit',
+ 'commit-graph',
'config',
'count-objects',
'credential',
@@ -308,6 +316,7 @@ local builtins = {
'revert',
'rm',
'send-pack',
+ 'serve',
'shortlog',
'show-branch',
'show-ref',
@@ -321,6 +330,7 @@ local builtins = {
'update-ref',
'update-server-info',
'upload-archive',
+ 'upload-pack',
'var',
'verify-commit',
'verify-pack',
@@ -361,7 +371,6 @@ x('imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/curl/libcurl.a.d'})
x('sh-i18n--envsubst')
x('shell')
x('show-index')
-x('upload-pack')
-- git-remote-testsvn is intentionally omitted.
x('remote-http', {'remote-curl.c', 'http.c.o', 'http-walker.c', '$builddir/pkg/curl/libcurl.a.d'})
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.17.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.18.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
man1/git-add.1
man1/git-am.1
man1/git-annotate.1
@@ -22,6 +22,7 @@ man1/git-citool.1
man1/git-clean.1
man1/git-clone.1
man1/git-column.1
+man1/git-commit-graph.1
man1/git-commit-tree.1
man1/git-commit.1
man1/git-config.1
diff --git a/pkg/git/rev b/pkg/git/rev
@@ -1 +1 @@
-30
+31
diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-4bdab1aed88ad7a12a766de8e03047eba5afbba9874c7effa5059e5481943727 git-manpages-2.17.0.tar.xz
+9ae3be95e63379597164c79c9018e84b7ef6964da923e5689dbc307693266096 git-manpages-2.18.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.17.0.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.18.0.tar.xz"
