From deaa05a46ef98f3a2ff53ac358b6ecdd4d8b0b4f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 28 Sep 2018 14:02:11 +0200
Subject: [PATCH] devel/git: sync with upstream

Taken from: HardenedBSD
---
 devel/git/Makefile    | 5 +++--
 devel/git/pkg-message | 2 ++
 devel/git/pkg-plist   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index f538e6dde0f..8fc6db1b2e8 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 DISTVERSION=	2.19.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -232,13 +233,13 @@ post-install-CONTRIB-on:
 	# will be useful
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 
 post-install-CONTRIB-off:
 	# Install the contrib completions anyway
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 
 post-install-P4-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
diff --git a/devel/git/pkg-message b/devel/git/pkg-message
index 630ed555f58..bfe04b2ce36 100644
--- a/devel/git/pkg-message
+++ b/devel/git/pkg-message
@@ -7,4 +7,6 @@ Also, if git's color output is broken (eg. color codes visible instead of
 applied) please consult the core.pager option in the git-config(1) manual, and
 your preferred pager's manual for color output options.
 
+bash completion script was renamed to git-completion.bash to keep original name
+
 -------------------------------------------------------------------------------
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index a885c270f9f..092e1171c28 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -6,7 +6,7 @@ bin/git-shell
 bin/git-upload-archive
 bin/git-upload-pack
 %%GUI%%bin/gitk
-etc/bash_completion.d/git.sh
+etc/bash_completion.d/git-completion.bash
 %%PERL%%%%SITE_PERL%%/FromCPAN/Error.pm
 %%PERL%%%%SITE_PERL%%/FromCPAN/Mail/Address.pm
 %%PERL%%%%SITE_PERL%%/Git.pm