From 4946d379daa9dbac2489d13294f462c5ee3a76c2 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 24 Mar 2017 10:37:24 -0700
Subject: git: Update to 2.12.1

---
 pkg/git/.gitignore |   2 +-
 pkg/git/config.h   |   2 +-
 pkg/git/man.txt    | 282 ++++++++++++++++++++++++++---------------------------
 pkg/git/rev        |   2 +-
 pkg/git/sha256     |   2 +-
 pkg/git/src        |   2 +-
 pkg/git/url        |   2 +-
 7 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index c7a2facd..4e370c60 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.12.0.tar.xz
+/git-manpages-2.12.1.tar.xz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index da25eb07..2a5bc0ac 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -9,7 +9,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.12.0"
+#define GIT_VERSION "2.12.1"
 #define NO_SYS_POLL_H
 #define PAGER_ENV "LESS=FRX LV=-c"
 #define SHA1_HEADER <openssl/sha.h>
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index f2998673..a0f89a54 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -1,170 +1,170 @@
-# 2,<xzcat git-manpages-2.12.0.tar.xz | pax -s '/\.\///' '*.[1-9]'
-man5/githooks.5
-man5/gitattributes.5
-man5/gitweb.conf.5
-man5/gitmodules.5
-man5/gitignore.5
-man5/gitrepository-layout.5
-man1/git-verify-commit.1
-man1/git-help.1
-man1/git-checkout-index.1
-man1/git-tag.1
-man1/git-push.1
-man1/git-annotate.1
-man1/git-show-ref.1
-man1/git-mktag.1
-man1/git-shell.1
-man1/git-receive-pack.1
-man1/git-count-objects.1
-man1/git-cat-file.1
-man1/git-rev-parse.1
-man1/git-remote.1
-man1/gitremote-helpers.1
+# 2,<xzcat git-manpages-2.12.1.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
 man1/git-add.1
-man1/git-credential.1
-man1/git-check-attr.1
-man1/git-check-mailmap.1
-man1/git-sh-i18n--envsubst.1
-man1/git-hash-object.1
-man1/git-send-email.1
-man1/git-mailinfo.1
-man1/git-archive.1
-man1/git-check-ref-format.1
-man1/git-rerere.1
-man1/git-quiltimport.1
-man1/git-fast-export.1
+man1/git-am.1
+man1/git-annotate.1
 man1/git-apply.1
-man1/git-shortlog.1
-man1/git-filter-branch.1
-man1/git-fetch-pack.1
-man1/git-cvsexportcommit.1
-man1/git-mv.1
-man1/git-request-pull.1
+man1/git-archimport.1
+man1/git-archive.1
 man1/git-bisect.1
-man1/git-stripspace.1
-man1/git-remote-ext.1
-man1/git-for-each-ref.1
-man1/git-remote-fd.1
-man1/git-format-patch.1
-man1/git-http-backend.1
-man1/git-diff-index.1
+man1/git-blame.1
+man1/git-branch.1
 man1/git-bundle.1
-man1/git-http-push.1
-man1/git-fsck.1
-man1/git-pull.1
+man1/git-cat-file.1
+man1/git-check-attr.1
 man1/git-check-ignore.1
+man1/git-check-mailmap.1
+man1/git-check-ref-format.1
+man1/git-checkout-index.1
+man1/git-checkout.1
 man1/git-cherry-pick.1
-man1/git-upload-pack.1
 man1/git-cherry.1
-man1/git-mergetool.1
-man1/git-prune.1
-man1/git-status.1
-man1/git-credential-store.1
-man1/git-parse-remote.1
+man1/git-citool.1
+man1/git-clean.1
+man1/git-clone.1
+man1/git-column.1
 man1/git-commit-tree.1
-man1/git-ls-files.1
-man1/git-show.1
-man1/gitk.1
-man1/git-rm.1
-man1/gitweb.1
-man1/git-sh-i18n.1
 man1/git-commit.1
-man1/git-mergetool--lib.1
+man1/git-config.1
+man1/git-count-objects.1
+man1/git-credential-cache--daemon.1
+man1/git-credential-cache.1
+man1/git-credential-store.1
+man1/git-credential.1
+man1/git-cvsexportcommit.1
 man1/git-cvsimport.1
-man1/git-send-pack.1
-man1/git-web--browse.1
-man1/git-grep.1
+man1/git-cvsserver.1
+man1/git-daemon.1
+man1/git-describe.1
+man1/git-diff-files.1
+man1/git-diff-index.1
+man1/git-diff-tree.1
+man1/git-diff.1
+man1/git-difftool.1
+man1/git-fast-export.1
+man1/git-fast-import.1
+man1/git-fetch-pack.1
+man1/git-fetch.1
+man1/git-filter-branch.1
+man1/git-fmt-merge-msg.1
+man1/git-for-each-ref.1
+man1/git-format-patch.1
+man1/git-fsck-objects.1
+man1/git-fsck.1
 man1/git-gc.1
 man1/git-get-tar-commit-id.1
-man1/git-repack.1
-man1/git-interpret-trailers.1
-man1/git-reflog.1
+man1/git-grep.1
+man1/git-gui.1
+man1/git-hash-object.1
+man1/git-help.1
+man1/git-http-backend.1
 man1/git-http-fetch.1
+man1/git-http-push.1
+man1/git-imap-send.1
 man1/git-index-pack.1
-man1/git-unpack-file.1
-man1/git-verify-tag.1
-man1/git-mktree.1
-man1/git-var.1
-man1/git-difftool.1
-man1/git-cvsserver.1
-man1/git-branch.1
-man1/git-stash.1
-man1/git-ls-remote.1
-man1/git-gui.1
-man1/git-p4.1
-man1/git-merge-index.1
-man1/git-stage.1
-man1/git-diff-files.1
-man1/git-checkout.1
-man1/git-fmt-merge-msg.1
-man1/git-patch-id.1
-man1/git-citool.1
-man1/git-merge-file.1
-man1/git-mailsplit.1
-man1/git-write-tree.1
+man1/git-init-db.1
+man1/git-init.1
+man1/git-instaweb.1
+man1/git-interpret-trailers.1
 man1/git-log.1
-man1/git-upload-archive.1
-man1/git-worktree.1
-man1/git-revert.1
-man1/git-rev-list.1
-man1/git-imap-send.1
+man1/git-ls-files.1
+man1/git-ls-remote.1
 man1/git-ls-tree.1
-man1/git-init-db.1
-man1/git-update-server-info.1
-man1/git-read-tree.1
+man1/git-mailinfo.1
+man1/git-mailsplit.1
+man1/git-merge-base.1
+man1/git-merge-file.1
+man1/git-merge-index.1
+man1/git-merge-one-file.1
 man1/git-merge-tree.1
+man1/git-merge.1
+man1/git-mergetool--lib.1
+man1/git-mergetool.1
+man1/git-mktag.1
+man1/git-mktree.1
+man1/git-mv.1
+man1/git-name-rev.1
 man1/git-notes.1
-man1/git-verify-pack.1
-man1/git.1
+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
+man1/git-pull.1
+man1/git-push.1
+man1/git-quiltimport.1
+man1/git-read-tree.1
 man1/git-rebase.1
-man1/git-fsck-objects.1
-man1/git-unpack-objects.1
-man1/git-describe.1
-man1/git-show-branch.1
-man1/git-sh-setup.1
-man1/git-whatchanged.1
-man1/git-config.1
-man1/git-credential-cache.1
-man1/git-blame.1
+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
-man1/git-pack-refs.1
-man1/git-pack-redundant.1
-man1/git-archimport.1
+man1/git-request-pull.1
+man1/git-rerere.1
 man1/git-reset.1
-man1/git-merge.1
-man1/git-submodule.1
-man1/git-update-index.1
-man1/git-name-rev.1
-man1/git-diff.1
-man1/git-instaweb.1
-man1/git-merge-one-file.1
-man1/git-init.1
-man1/git-prune-packed.1
-man1/git-merge-base.1
+man1/git-rev-list.1
+man1/git-rev-parse.1
+man1/git-revert.1
+man1/git-rm.1
+man1/git-send-email.1
+man1/git-send-pack.1
+man1/git-sh-i18n--envsubst.1
+man1/git-sh-i18n.1
+man1/git-sh-setup.1
+man1/git-shell.1
+man1/git-shortlog.1
+man1/git-show-branch.1
 man1/git-show-index.1
-man1/git-update-ref.1
-man1/git-daemon.1
-man1/git-pack-objects.1
-man1/git-clean.1
-man1/git-credential-cache--daemon.1
-man1/git-am.1
-man1/git-diff-tree.1
-man1/git-fast-import.1
-man1/git-fetch.1
-man1/git-clone.1
+man1/git-show-ref.1
+man1/git-show.1
+man1/git-stage.1
+man1/git-stash.1
+man1/git-status.1
+man1/git-stripspace.1
+man1/git-submodule.1
 man1/git-svn.1
-man1/git-column.1
 man1/git-symbolic-ref.1
-man7/gitcore-tutorial.7
-man7/gittutorial.7
-man7/gittutorial-2.7
+man1/git-tag.1
+man1/git-unpack-file.1
+man1/git-unpack-objects.1
+man1/git-update-index.1
+man1/git-update-ref.1
+man1/git-update-server-info.1
+man1/git-upload-archive.1
+man1/git-upload-pack.1
+man1/git-var.1
+man1/git-verify-commit.1
+man1/git-verify-pack.1
+man1/git-verify-tag.1
+man1/git-web--browse.1
+man1/git-whatchanged.1
+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
+man5/gitignore.5
+man5/gitmodules.5
+man5/gitrepository-layout.5
+man5/gitweb.conf.5
 man7/gitcli.7
-man7/gitglossary.7
+man7/gitcore-tutorial.7
+man7/gitcredentials.7
 man7/gitcvs-migration.7
 man7/gitdiffcore.7
-man7/gitworkflows.7
-man7/gitcredentials.7
-man7/gitrevisions.7
-man7/gitnamespaces.7
 man7/giteveryday.7
+man7/gitglossary.7
+man7/gitnamespaces.7
+man7/gitrevisions.7
+man7/gittutorial-2.7
+man7/gittutorial.7
+man7/gitworkflows.7
diff --git a/pkg/git/rev b/pkg/git/rev
index b4de3947..48082f72 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-11
+12
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index d58de96d..aa21329c 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-8b8356f8d50eff6499c5d05e87c106a7b1b48bd16de1742fa022631909804773  git-manpages-2.12.0.tar.xz
+fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce  git-manpages-2.12.1.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
index e7e07d5a..1f6b1afe 160000
--- a/pkg/git/src
+++ b/pkg/git/src
@@ -1 +1 @@
-Subproject commit e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7
+Subproject commit 1f6b1afea00cdbc99114b88768aa5e617ff479df
diff --git a/pkg/git/url b/pkg/git/url
index a78aee34..10763b41 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.12.0.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.12.1.tar.xz"
-- 
cgit v1.2.3