From cbf632662ac06d3ee7bb261a67ecedd3864a2a4b Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 23 Dec 2018 11:27:56 -0800
Subject: git: Update to 2.20.1

---
 pkg/git/commands.txt | 83 ++++++++++++++++++++++++++++++++++++++++++++++++----
 pkg/git/config.h     |  4 +--
 pkg/git/gen.lua      | 15 +++++++---
 pkg/git/man.txt      |  3 +-
 pkg/git/rev          |  2 +-
 pkg/git/sha256       |  2 +-
 pkg/git/src          |  2 +-
 pkg/git/url          |  2 +-
 8 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
index 089d322f..120aa579 100644
--- 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
+# 2,<cd src/Documentation && printf '%s\n' git*.txt *config.txt config/*.txt
 git-add.txt
 git-am.txt
 git-annotate.txt
@@ -83,6 +83,7 @@ git-mergetool--lib.txt
 git-mergetool.txt
 git-mktag.txt
 git-mktree.txt
+git-multi-pack-index.txt
 git-mv.txt
 git-name-rev.txt
 git-notes.txt
@@ -174,8 +175,80 @@ gitweb.conf.txt
 gitweb.txt
 gitworkflows.txt
 config.txt
-diff-config.txt
-fmt-merge-msg-config.txt
 git-config.txt
-merge-config.txt
-rebase-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/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/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
index a689de1e..093078bb 100644
--- 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 "2512f15446149235156528dafbe75930c712b29e"
+#define GIT_BUILT_FROM_COMMIT "0d0ac3826a3bbb9247e39e12623bbcfdd722f24c"
 #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.19.2"
+#define GIT_VERSION "2.20.1"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 6c5890fb..48acebdf 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -46,6 +46,7 @@ lib('libgit.a', [[
 	combine-diff.c
 	commit.c
 	commit-graph.c
+	commit-reach.c
 	compat/obstack.c
 	compat/regex/regex.c.o
 	compat/terminal.c
@@ -60,6 +61,7 @@ lib('libgit.a', [[
 	ctype.c
 	date.c
 	decorate.c
+	delta-islands.c
 	diff-delta.c
 	diff-lib.c
 	diff-no-index.c
@@ -93,6 +95,7 @@ lib('libgit.a', [[
 	help.c
 	hex.c
 	ident.c
+	interdiff.c
 	json-writer.c
 	kwset.c
 	levenshtein.c
@@ -113,6 +116,7 @@ lib('libgit.a', [[
 	merge-recursive.c
 	merge.c
 	mergesort.c
+	midx.c
 	name-hash.c
 	negotiator/default.c
 	negotiator/skipping.c
@@ -148,6 +152,7 @@ lib('libgit.a', [[
 	range-diff.c
 	reachable.c
 	read-cache.c
+	rebase-interactive.c
 	ref-filter.c
 	reflog-walk.c
 	refs.c
@@ -185,6 +190,7 @@ lib('libgit.a', [[
 	symlinks.c
 	tag.c
 	tempfile.c
+	thread-utils.c
 	tmp-objdir.c
 	trace.c
 	trailer.c
@@ -217,7 +223,6 @@ lib('libgit.a', [[
 	sha1dc/sha1.c
 	sha1dc/ubc_check.c
 
-	thread-utils.c
 	libxdiff.a
 	$builddir/pkg/zlib/libz.a
 ]])
@@ -295,6 +300,7 @@ local builtins = {
 	'merge-tree',
 	'mktag',
 	'mktree',
+	'multi-pack-index',
 	'mv',
 	'name-rev',
 	'notes',
@@ -308,7 +314,8 @@ local builtins = {
 	'push',
 	'range-diff',
 	'read-tree',
-	'rebase--helper',
+	'rebase',
+	'rebase--interactive',
 	'receive-pack',
 	'reflog',
 	'remote',
@@ -400,7 +407,7 @@ x('merge-one-file', '755')
 x('merge-resolve', '755')
 x('mergetool', '755')
 x('quiltimport', '755')
-x('rebase', '755')
+x('legacy-rebase', '755')
 x('remote-testgit', '755')
 x('request-pull', '755')
 x('stash', '755')
@@ -411,7 +418,7 @@ x('web--browse', '755')
 x('mergetool--lib', '644')
 x('parse-remote', '644')
 x('rebase--am', '644')
-x('rebase--interactive', '644')
+x('rebase--common', '644')
 x('rebase--preserve-merges', '644')
 x('rebase--merge', '644')
 x('sh-setup', '644')
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index 63a0b157..8fc6e756 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.19.2.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.20.1.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
 man1/git-add.1
 man1/git-am.1
 man1/git-annotate.1
@@ -82,6 +82,7 @@ man1/git-mergetool--lib.1
 man1/git-mergetool.1
 man1/git-mktag.1
 man1/git-mktree.1
+man1/git-multi-pack-index.1
 man1/git-mv.1
 man1/git-name-rev.1
 man1/git-notes.1
diff --git a/pkg/git/rev b/pkg/git/rev
index a7873645..8f92bfdd 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-34
+35
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index e04b29c5..cf9f7df4 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-25fd8ba1914f5859b59f72d6c6aa2324abe84891e071adae2195faa526a510eb  git-manpages-2.19.2.tar.xz
+060acce347cfb712d0c7dfe7578c5291fde2d3d807917b2828c8aae3c90876ba  git-manpages-2.20.1.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
index 98cdfbb8..0d0ac382 160000
--- a/pkg/git/src
+++ b/pkg/git/src
@@ -1 +1 @@
-Subproject commit 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad
+Subproject commit 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c
diff --git a/pkg/git/url b/pkg/git/url
index a7d15b31..fd11f46c 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.19.2.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.20.1.tar.xz"
-- 
cgit v1.2.3