4 files changed, 8 insertions, 14 deletions

diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index cab8bc21f3e5..31362585ad0a 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-extras
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	devel
 
 MAINTAINER=	igor.ostapenko@gmail.com
@@ -14,8 +14,7 @@ RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tj
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	28f0ad8
+GH_COMMIT=	075d0ce
 
 USES=		gmake shebangfix
 SHEBANG_FILES=	bin/git-squash
diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo
index 91f4e176b3b9..10ff1395e59d 100644
--- a/devel/git-extras/distinfo
+++ b/devel/git-extras/distinfo
@@ -1,2 +1,2 @@
-SHA256 (git-extras-2.1.0.tar.gz) = bcd0aed2f6675929f59d4be386a34f71023c7851f69d60f2d9360131705b40b7
-SIZE (git-extras-2.1.0.tar.gz) = 51203
+SHA256 (git-extras-2.2.0.tar.gz) = 1cfeaa9f2644a37541f8c4e8f175222c70b36fe9672fc7f9c9ef248c0071e4bb
+SIZE (git-extras-2.2.0.tar.gz) = 52513
diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile
index 933e9071a02c..e904f7282655 100644
--- a/devel/git-extras/files/patch-Makefile
+++ b/devel/git-extras/files/patch-Makefile
@@ -9,15 +9,6 @@
  BINS = $(wildcard bin/git-*)
  MANS = $(wildcard man/git-*.md)
  MAN_HTML = $(MANS:.md=.html)
-@@ -17,7 +18,7 @@
- 	@mkdir -p $(DESTDIR)$(BINPREFIX)
- 	@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
- 	@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
--	$(eval TEMPFILE := $(shell mktemp))
-+	$(eval TEMPFILE := $(shell mktemp -t git-extras))
- 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
- 	@chmod 775 $(TEMPFILE)
- 	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
 @@ -31,8 +32,8 @@
  		cp -f bin/$(COMMAND) $(DESTDIR)$(BINPREFIX); \
  	)
diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist
index 4d951c98edd2..12b5f828485b 100644
--- a/devel/git-extras/pkg-plist
+++ b/devel/git-extras/pkg-plist
@@ -23,6 +23,7 @@ bin/git-info
 bin/git-line-summary
 bin/git-local-commits
 bin/git-lock
+bin/git-locked
 bin/git-missing
 bin/git-obliterate
 bin/git-pr
@@ -33,6 +34,7 @@ bin/git-release
 bin/git-rename-tag
 bin/git-repl
 bin/git-reset-file
+bin/git-root
 bin/git-setup
 bin/git-show-tree
 bin/git-squash
@@ -65,6 +67,7 @@ man/man1/git-ignore.1.gz
 man/man1/git-info.1.gz
 man/man1/git-local-commits.1.gz
 man/man1/git-lock.1.gz
+man/man1/git-locked.1.gz
 man/man1/git-missing.1.gz
 man/man1/git-pr.1.gz
 man/man1/git-rebase-patch.1.gz
@@ -73,6 +76,7 @@ man/man1/git-release.1.gz
 man/man1/git-rename-tag.1.gz
 man/man1/git-repl.1.gz
 man/man1/git-reset-file.1.gz
+man/man1/git-root.1.gz
 man/man1/git-setup.1.gz
 man/man1/git-show-tree.1.gz
 man/man1/git-squash.1.gz