devel/git: update to 2.22.0

Changes:	https://lkml.org/lkml/2019/6/7/1177
Changes:	https://github.blog/2019-06-07-highlights-from-git-2-22/
PR:		238442
Approved by:	garga (maintainer)

3 files changed, 12 insertions, 15 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 6d60b7a1053a..f4263117e5ae 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.21.0
+DISTVERSION=	2.22.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 6f3080b14efb..a7492d057684 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1551062552
-SHA256 (git-2.21.0.tar.xz) = 8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28
-SIZE (git-2.21.0.tar.xz) = 5491296
-SHA256 (git-manpages-2.21.0.tar.xz) = 2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51
-SIZE (git-manpages-2.21.0.tar.xz) = 440096
-SHA256 (git-htmldocs-2.21.0.tar.xz) = b1758e9903b21bad5cb5694617df22b2aa23c093541fb282bf11862df4962ca1
-SIZE (git-htmldocs-2.21.0.tar.xz) = 1234956
+TIMESTAMP = 1559932652
+SHA256 (git-2.22.0.tar.xz) = 159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
+SIZE (git-2.22.0.tar.xz) = 5609772
+SHA256 (git-manpages-2.22.0.tar.xz) = 4e2cfda33d8e86812bfcdb907478d1144412ce472c32edd0219b3c0201c7ee3a
+SIZE (git-manpages-2.22.0.tar.xz) = 443320
+SHA256 (git-htmldocs-2.22.0.tar.xz) = 5c7e010abfca5ff2eabf3616bf7216609cfb93dbc12b7c4e13f4ae3e539dbc79
+SIZE (git-htmldocs-2.22.0.tar.xz) = 1262136
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 6d9265255b28..1043f603b310 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -98,7 +98,7 @@ libexec/git-core/git-init
 libexec/git-core/git-init-db
 libexec/git-core/git-instaweb
 libexec/git-core/git-interpret-trailers
-libexec/git-core/git-legacy-rebase
+libexec/git-core/git-legacy-stash
 libexec/git-core/git-log
 libexec/git-core/git-ls-files
 libexec/git-core/git-ls-remote
@@ -140,7 +140,6 @@ libexec/git-core/git-read-tree
 libexec/git-core/git-rebase
 libexec/git-core/git-rebase--am
 libexec/git-core/git-rebase--common
-libexec/git-core/git-rebase--interactive
 libexec/git-core/git-rebase--preserve-merges
 libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
@@ -163,7 +162,6 @@ libexec/git-core/git-revert
 libexec/git-core/git-rm
 %%SEND_EMAIL%%libexec/git-core/git-send-email
 libexec/git-core/git-send-pack
-libexec/git-core/git-serve
 libexec/git-core/git-sh-i18n
 libexec/git-core/git-sh-i18n--envsubst
 libexec/git-core/git-sh-setup
@@ -217,6 +215,7 @@ libexec/git-core/mergetools/kompare
 libexec/git-core/mergetools/meld
 libexec/git-core/mergetools/opendiff
 libexec/git-core/mergetools/p4merge
+libexec/git-core/mergetools/smerge
 libexec/git-core/mergetools/tkdiff
 libexec/git-core/mergetools/tortoisemerge
 libexec/git-core/mergetools/vimdiff
@@ -329,7 +328,6 @@ man/man1/git-receive-pack.1.gz
 man/man1/git-reflog.1.gz
 man/man1/git-remote-ext.1.gz
 man/man1/git-remote-fd.1.gz
-man/man1/git-remote-testgit.1.gz
 man/man1/git-remote.1.gz
 man/man1/git-repack.1.gz
 man/man1/git-replace.1.gz
@@ -377,7 +375,6 @@ man/man1/git-worktree.1.gz
 man/man1/git-write-tree.1.gz
 man/man1/git.1.gz
 %%GUI%%man/man1/gitk.1.gz
-man/man1/gitremote-helpers.1.gz
 man/man1/gitweb.1.gz
 man/man5/gitattributes.5.gz
 man/man5/githooks.5.gz
@@ -393,6 +390,7 @@ man/man7/gitdiffcore.7.gz
 man/man7/giteveryday.7.gz
 man/man7/gitglossary.7.gz
 man/man7/gitnamespaces.7.gz
+man/man7/gitremote-helpers.7.gz
 man/man7/gitrevisions.7.gz
 man/man7/gitsubmodules.7.gz
 man/man7/gittutorial-2.7.gz
@@ -974,8 +972,6 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-remote-helpers.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-remote.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-repack.html
@@ -1271,6 +1267,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/coccinelle/README
 %%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci
+%%CONTRIB%%share/git-core/contrib/coccinelle/flex_alloc.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci