diff --git a/devel/git-base/MESSAGE b/devel/git-base/MESSAGE
index 8bd34cc9752b9..1598125dff09c 100644
--- a/devel/git-base/MESSAGE
+++ b/devel/git-base/MESSAGE
@@ -1,9 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/01/16 09:34:27 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2016/05/26 15:41:06 khorben Exp $
 
 NOTE:	Pristine templates are located in:
 	${GIT_TEMPLATE_INSTDIR}.
 
+To use the git-cvsimport repository conversion from CVS, install git-cvs.
+
 To use the git-svn interface to Subversion, install git-svn.
 
 ===========================================================================
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 3c87beb40bd80..596a577c7278f 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/03/12 11:33:32 adam Exp $
+# $NetBSD: Makefile,v 1.46 2017/09/27 06:37:47 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -29,6 +29,7 @@ CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
 CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-libpcre2=${BUILDLINK_PREFIX.pcre2}
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--without-tcltk
@@ -107,6 +108,8 @@ post-install:
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index 26b25a06c8087..b4a3317e56699 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10.4.1 2016/03/22 18:55:23 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/11/02 06:18:11 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -111,11 +111,11 @@ libexec/git-core/git-quiltimport
 libexec/git-core/git-read-tree
 libexec/git-core/git-rebase
 libexec/git-core/git-rebase--am
+libexec/git-core/git-rebase--helper
 libexec/git-core/git-rebase--interactive
 libexec/git-core/git-rebase--merge
 libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
-libexec/git-core/git-relink
 libexec/git-core/git-remote
 libexec/git-core/git-remote-ext
 libexec/git-core/git-remote-fd
@@ -177,6 +177,7 @@ libexec/git-core/mergetools/diffmerge
 libexec/git-core/mergetools/diffuse
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/examdiff
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
@@ -202,12 +203,14 @@ share/examples/git/templates/hooks/pre-applypatch.sample
 share/examples/git/templates/hooks/pre-commit.sample
 share/examples/git/templates/hooks/pre-push.sample
 share/examples/git/templates/hooks/pre-rebase.sample
+share/examples/git/templates/hooks/pre-receive.sample
 share/examples/git/templates/hooks/prepare-commit-msg.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude
 share/locale/bg/LC_MESSAGES/git.mo
 share/locale/ca/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
+share/locale/es/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index aa09672de57e0..05a8dd80a42fb 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,25 +1,15 @@
-$NetBSD: distinfo,v 1.41.2.1 2016/03/22 18:55:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.74 2017/11/30 07:50:01 adam Exp $
 
-SHA1 (git-2.7.3.tar.xz) = d7be9af73cc56c606e0744beb0091b612b416909
-RMD160 (git-2.7.3.tar.xz) = 5111811158362bbc6d4e0a97ec8df8e56c1bd674
-SHA512 (git-2.7.3.tar.xz) = f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72
-Size (git-2.7.3.tar.xz) = 3909636 bytes
-SHA1 (patch-aa) = 892e2dc9336a794399046ac2b4c59f3650d458f8
-SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
+SHA1 (git-2.15.1.tar.xz) = 0ff2d0c64621f92e15759b2ca07838858bef8ff0
+RMD160 (git-2.15.1.tar.xz) = 4faa07120bec5376a76330cdebe5b43e283856d7
+SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
+Size (git-2.15.1.tar.xz) = 4894768 bytes
+SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
+SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
-SHA1 (patch-builtin_pack-objects.c) = 8038e9fca76f465c87d6e4265cb657965fca5fee
-SHA1 (patch-builtin_rev-list.c) = 52605a6e05e62e45a161e09dba5cf0ae448d642c
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
-SHA1 (patch-http-push.c) = ff931b9043ca8ddedc336d27efe8102e5372b66a
-SHA1 (patch-list-objects.c) = 0250fb74b635d27694dc8e7c99f48a0ba1f23ab7
-SHA1 (patch-list-objects.h) = e341343431e6b64bb6bf4463d632f50107110f37
-SHA1 (patch-pack-bitmap-write.c) = 31492718f3812a9229d33ebe4b8bfcebce0e5805
-SHA1 (patch-pack-bitmap.c) = 76c23b6b328a6b113b58ef026231623d73d1f088
-SHA1 (patch-reachable.c) = b58b59073662b74bbae02f83a5e05c29dee76185
-SHA1 (patch-revision.c) = d9b372b3930578817f5517cc76639fce832a0c58
-SHA1 (patch-revision.h) = 3258d405f6d2d3e5103d1e34cbcefec3da767298
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
diff --git a/devel/git-base/options.mk b/devel/git-base/options.mk
index 4483c5f23eb4e..f3efa91410d35 100644
--- a/devel/git-base/options.mk
+++ b/devel/git-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/08/01 19:18:39 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2016/04/11 04:22:33 dbj Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.git
 PKG_SUPPORTED_OPTIONS=	python apple-common-crypto
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--without-python
 
 .if !empty(PKG_OPTIONS:Mapple-common-crypto)
 .  if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-PKG_FAIL_REASON=	"apple-common-crypto not available on this system"
+PKG_FAIL_REASON+=	"apple-common-crypto not available on this system"
 .  endif
 CONFIGURE_ARGS+=	--without-openssl
 .else
diff --git a/devel/git-base/patches/patch-aa b/devel/git-base/patches/patch-aa
index 880cc23e6042e..6572e1e26d117 100644
--- a/devel/git-base/patches/patch-aa
+++ b/devel/git-base/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
+$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
 
---- Makefile.orig	2015-10-16 21:58:26.000000000 +0000
+--- Makefile.orig	2016-09-03 01:59:09.000000000 +0000
 +++ Makefile
-@@ -371,8 +371,6 @@ GIT-VERSION-FILE: FORCE
- 
- CFLAGS = -g -O2 -Wall
+@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
+ 	-Wunused \
+ 	-Wvla
  LDFLAGS =
 -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 -ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
  
  # Create as necessary, replace existing, make ranlib unneeded.
-@@ -416,13 +414,9 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -441,13 +439,9 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
 -TAR = tar
  FIND = find
 -INSTALL = install
- RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1586,8 +1580,8 @@ ifdef DEFAULT_HELP_FORMAT
- BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
- endif
+ XGETTEXT = xgettext
+@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+ BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
  
 -ALL_CFLAGS += $(BASIC_CFLAGS)
 -ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2278,11 +2272,10 @@ install: all
+@@ -2341,11 +2335,10 @@ install: all
  ifndef NO_GETTEXT
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
  	(cd po/build/locale && $(TAR) cf - .) | \
diff --git a/devel/git-base/patches/patch-ac b/devel/git-base/patches/patch-ac
index 92cc8eb569c08..589ad2a623ec3 100644
--- a/devel/git-base/patches/patch-ac
+++ b/devel/git-base/patches/patch-ac
@@ -1,11 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2014/08/01 19:18:39 schmonz Exp $
+$NetBSD: patch-ac,v 1.3 2017/02/25 08:32:57 adam Exp $
 
---- gitk-git/Makefile.orig	2014-05-30 21:38:10.000000000 +0000
+--- gitk-git/Makefile.orig	2017-02-24 19:17:39.000000000 +0000
 +++ gitk-git/Makefile
-@@ -50,9 +50,9 @@ endif
+@@ -50,10 +50,9 @@ endif
  all:: gitk-wish $(ALL_MSGFILES)
  
  install:: all
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 -	$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 -	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
 -	$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
diff --git a/devel/git-base/patches/patch-builtin_pack-objects.c b/devel/git-base/patches/patch-builtin_pack-objects.c
deleted file mode 100644
index 34a50717bd6f4..0000000000000
--- a/devel/git-base/patches/patch-builtin_pack-objects.c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-builtin_pack-objects.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- builtin/pack-objects.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ builtin/pack-objects.c
-@@ -2285,21 +2285,11 @@ static void show_commit(struct commit *c
- 		index_commit_for_bitmap(commit);
- }
- 
--static void show_object(struct object *obj,
--			const struct name_path *path, const char *last,
--			void *data)
-+static void show_object(struct object *obj, const char *name, void *data)
- {
--	char *name = path_name(path, last);
--
- 	add_preferred_base_object(name);
- 	add_object_entry(obj->oid.hash, obj->type, name, 0);
- 	obj->flags |= OBJECT_ADDED;
--
--	/*
--	 * We will have generated the hash from the name,
--	 * but not saved a pointer to it - we can free it
--	 */
--	free((char *)name);
- }
- 
- static void show_edge(struct commit *commit)
-@@ -2481,8 +2471,7 @@ static int get_object_list_from_bitmap(s
- }
- 
- static void record_recent_object(struct object *obj,
--				 const struct name_path *path,
--				 const char *last,
-+				 const char *name,
- 				 void *data)
- {
- 	sha1_array_append(&recent_objects, obj->oid.hash);
diff --git a/devel/git-base/patches/patch-builtin_rev-list.c b/devel/git-base/patches/patch-builtin_rev-list.c
deleted file mode 100644
index 1da32191712ef..0000000000000
--- a/devel/git-base/patches/patch-builtin_rev-list.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-builtin_rev-list.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- builtin/rev-list.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ builtin/rev-list.c
-@@ -177,9 +177,7 @@ static void finish_commit(struct commit 
- 	free_commit_buffer(commit);
- }
- 
--static void finish_object(struct object *obj,
--			  const struct name_path *path, const char *name,
--			  void *cb_data)
-+static void finish_object(struct object *obj, const char *name, void *cb_data)
- {
- 	struct rev_list_info *info = cb_data;
- 	if (obj->type == OBJ_BLOB && !has_object_file(&obj->oid))
-@@ -188,15 +186,13 @@ static void finish_object(struct object 
- 		parse_object(obj->oid.hash);
- }
- 
--static void show_object(struct object *obj,
--			const struct name_path *path, const char *component,
--			void *cb_data)
-+static void show_object(struct object *obj, const char *name, void *cb_data)
- {
- 	struct rev_list_info *info = cb_data;
--	finish_object(obj, path, component, cb_data);
-+	finish_object(obj, name, cb_data);
- 	if (info->flags & REV_LIST_QUIET)
- 		return;
--	show_object_with_name(stdout, obj, path, component);
-+	show_object_with_name(stdout, obj, name);
- }
- 
- static void show_edge(struct commit *commit)
diff --git a/devel/git-base/patches/patch-http-push.c b/devel/git-base/patches/patch-http-push.c
deleted file mode 100644
index 9b45418a54a3a..0000000000000
--- a/devel/git-base/patches/patch-http-push.c
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-http-push.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- http-push.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ http-push.c
-@@ -1277,9 +1277,7 @@ static struct object_list **add_one_obje
- }
- 
- static struct object_list **process_blob(struct blob *blob,
--					 struct object_list **p,
--					 struct name_path *path,
--					 const char *name)
-+					 struct object_list **p)
- {
- 	struct object *obj = &blob->object;
- 
-@@ -1293,14 +1291,11 @@ static struct object_list **process_blob
- }
- 
- static struct object_list **process_tree(struct tree *tree,
--					 struct object_list **p,
--					 struct name_path *path,
--					 const char *name)
-+					 struct object_list **p)
- {
- 	struct object *obj = &tree->object;
- 	struct tree_desc desc;
- 	struct name_entry entry;
--	struct name_path me;
- 
- 	obj->flags |= LOCAL;
- 
-@@ -1310,21 +1305,17 @@ static struct object_list **process_tree
- 		die("bad tree object %s", oid_to_hex(&obj->oid));
- 
- 	obj->flags |= SEEN;
--	name = xstrdup(name);
- 	p = add_one_object(obj, p);
--	me.up = path;
--	me.elem = name;
--	me.elem_len = strlen(name);
- 
- 	init_tree_desc(&desc, tree->buffer, tree->size);
- 
- 	while (tree_entry(&desc, &entry))
- 		switch (object_type(entry.mode)) {
- 		case OBJ_TREE:
--			p = process_tree(lookup_tree(entry.sha1), p, &me, name);
-+			p = process_tree(lookup_tree(entry.sha1), p);
- 			break;
- 		case OBJ_BLOB:
--			p = process_blob(lookup_blob(entry.sha1), p, &me, name);
-+			p = process_blob(lookup_blob(entry.sha1), p);
- 			break;
- 		default:
- 			/* Subproject commit - not in this repository */
-@@ -1343,7 +1334,7 @@ static int get_delta(struct rev_info *re
- 	int count = 0;
- 
- 	while ((commit = get_revision(revs)) != NULL) {
--		p = process_tree(commit->tree, p, NULL, "");
-+		p = process_tree(commit->tree, p);
- 		commit->object.flags |= LOCAL;
- 		if (!(commit->object.flags & UNINTERESTING))
- 			count += add_send_request(&commit->object, lock);
-@@ -1362,11 +1353,11 @@ static int get_delta(struct rev_info *re
- 			continue;
- 		}
- 		if (obj->type == OBJ_TREE) {
--			p = process_tree((struct tree *)obj, p, NULL, name);
-+			p = process_tree((struct tree *)obj, p);
- 			continue;
- 		}
- 		if (obj->type == OBJ_BLOB) {
--			p = process_blob((struct blob *)obj, p, NULL, name);
-+			p = process_blob((struct blob *)obj, p);
- 			continue;
- 		}
- 		die("unknown pending object %s (%s)", oid_to_hex(&obj->oid), name);
diff --git a/devel/git-base/patches/patch-list-objects.c b/devel/git-base/patches/patch-list-objects.c
deleted file mode 100644
index bb54c0540223a..0000000000000
--- a/devel/git-base/patches/patch-list-objects.c
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-list-objects.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- list-objects.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ list-objects.c
-@@ -11,11 +11,12 @@
- static void process_blob(struct rev_info *revs,
- 			 struct blob *blob,
- 			 show_object_fn show,
--			 struct name_path *path,
-+			 struct strbuf *path,
- 			 const char *name,
- 			 void *cb_data)
- {
- 	struct object *obj = &blob->object;
-+	size_t pathlen;
- 
- 	if (!revs->blob_objects)
- 		return;
-@@ -24,7 +25,11 @@ static void process_blob(struct rev_info
- 	if (obj->flags & (UNINTERESTING | SEEN))
- 		return;
- 	obj->flags |= SEEN;
--	show(obj, path, name, cb_data);
-+
-+	pathlen = path->len;
-+	strbuf_addstr(path, name);
-+	show(obj, path->buf, cb_data);
-+	strbuf_setlen(path, pathlen);
- }
- 
- /*
-@@ -52,7 +57,7 @@ static void process_blob(struct rev_info
- static void process_gitlink(struct rev_info *revs,
- 			    const unsigned char *sha1,
- 			    show_object_fn show,
--			    struct name_path *path,
-+			    struct strbuf *path,
- 			    const char *name,
- 			    void *cb_data)
- {
-@@ -62,7 +67,6 @@ static void process_gitlink(struct rev_i
- static void process_tree(struct rev_info *revs,
- 			 struct tree *tree,
- 			 show_object_fn show,
--			 struct name_path *path,
- 			 struct strbuf *base,
- 			 const char *name,
- 			 void *cb_data)
-@@ -70,7 +74,6 @@ static void process_tree(struct rev_info
- 	struct object *obj = &tree->object;
- 	struct tree_desc desc;
- 	struct name_entry entry;
--	struct name_path me;
- 	enum interesting match = revs->diffopt.pathspec.nr == 0 ?
- 		all_entries_interesting: entry_not_interesting;
- 	int baselen = base->len;
-@@ -86,17 +89,12 @@ static void process_tree(struct rev_info
- 			return;
- 		die("bad tree object %s", oid_to_hex(&obj->oid));
- 	}
-+
- 	obj->flags |= SEEN;
--	show(obj, path, name, cb_data);
--	me.up = path;
--	me.elem = name;
--	me.elem_len = strlen(name);
--
--	if (!match) {
--		strbuf_addstr(base, name);
--		if (base->len)
--			strbuf_addch(base, '/');
--	}
-+	strbuf_addstr(base, name);
-+	show(obj, base->buf, cb_data);
-+	if (base->len)
-+		strbuf_addch(base, '/');
- 
- 	init_tree_desc(&desc, tree->buffer, tree->size);
- 
-@@ -113,16 +111,16 @@ static void process_tree(struct rev_info
- 		if (S_ISDIR(entry.mode))
- 			process_tree(revs,
- 				     lookup_tree(entry.sha1),
--				     show, &me, base, entry.path,
-+				     show, base, entry.path,
- 				     cb_data);
- 		else if (S_ISGITLINK(entry.mode))
- 			process_gitlink(revs, entry.sha1,
--					show, &me, entry.path,
-+					show, base, entry.path,
- 					cb_data);
- 		else
- 			process_blob(revs,
- 				     lookup_blob(entry.sha1),
--				     show, &me, entry.path,
-+				     show, base, entry.path,
- 				     cb_data);
- 	}
- 	strbuf_setlen(base, baselen);
-@@ -213,19 +211,19 @@ void traverse_commit_list(struct rev_inf
- 			continue;
- 		if (obj->type == OBJ_TAG) {
- 			obj->flags |= SEEN;
--			show_object(obj, NULL, name, data);
-+			show_object(obj, name, data);
- 			continue;
- 		}
- 		if (!path)
- 			path = "";
- 		if (obj->type == OBJ_TREE) {
- 			process_tree(revs, (struct tree *)obj, show_object,
--				     NULL, &base, path, data);
-+				     &base, path, data);
- 			continue;
- 		}
- 		if (obj->type == OBJ_BLOB) {
- 			process_blob(revs, (struct blob *)obj, show_object,
--				     NULL, path, data);
-+				     &base, path, data);
- 			continue;
- 		}
- 		die("unknown pending object %s (%s)",
diff --git a/devel/git-base/patches/patch-list-objects.h b/devel/git-base/patches/patch-list-objects.h
deleted file mode 100644
index 2c327d263e1ae..0000000000000
--- a/devel/git-base/patches/patch-list-objects.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-list-objects.h,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- list-objects.h.orig	2016-03-10 22:11:15.000000000 +0000
-+++ list-objects.h
-@@ -2,7 +2,7 @@
- #define LIST_OBJECTS_H
- 
- typedef void (*show_commit_fn)(struct commit *, void *);
--typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *);
-+typedef void (*show_object_fn)(struct object *, const char *, void *);
- void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
- 
- typedef void (*show_edge_fn)(struct commit *);
diff --git a/devel/git-base/patches/patch-pack-bitmap-write.c b/devel/git-base/patches/patch-pack-bitmap-write.c
deleted file mode 100644
index 7026003751906..0000000000000
--- a/devel/git-base/patches/patch-pack-bitmap-write.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-pack-bitmap-write.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- pack-bitmap-write.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ pack-bitmap-write.c
-@@ -148,8 +148,7 @@ static uint32_t find_object_pos(const un
- 	return entry->in_pack_pos;
- }
- 
--static void show_object(struct object *object, const struct name_path *path,
--			const char *last, void *data)
-+static void show_object(struct object *object, const char *name, void *data)
- {
- 	struct bitmap *base = data;
- 	bitmap_set(base, find_object_pos(object->oid.hash));
diff --git a/devel/git-base/patches/patch-pack-bitmap.c b/devel/git-base/patches/patch-pack-bitmap.c
deleted file mode 100644
index 88a3895d13804..0000000000000
--- a/devel/git-base/patches/patch-pack-bitmap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-pack-bitmap.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- pack-bitmap.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ pack-bitmap.c
-@@ -417,19 +417,15 @@ static int ext_index_add_object(struct o
- 	return bitmap_pos + bitmap_git.pack->num_objects;
- }
- 
--static void show_object(struct object *object, const struct name_path *path,
--			const char *last, void *data)
-+static void show_object(struct object *object, const char *name, void *data)
- {
- 	struct bitmap *base = data;
- 	int bitmap_pos;
- 
- 	bitmap_pos = bitmap_position(object->oid.hash);
- 
--	if (bitmap_pos < 0) {
--		char *name = path_name(path, last);
-+	if (bitmap_pos < 0)
- 		bitmap_pos = ext_index_add_object(object, name);
--		free(name);
--	}
- 
- 	bitmap_set(base, bitmap_pos);
- }
-@@ -897,9 +893,8 @@ struct bitmap_test_data {
- 	size_t seen;
- };
- 
--static void test_show_object(struct object *object,
--			     const struct name_path *path,
--			     const char *last, void *data)
-+static void test_show_object(struct object *object, const char *name,
-+			     void *data)
- {
- 	struct bitmap_test_data *tdata = data;
- 	int bitmap_pos;
diff --git a/devel/git-base/patches/patch-reachable.c b/devel/git-base/patches/patch-reachable.c
deleted file mode 100644
index 4be8411e9e375..0000000000000
--- a/devel/git-base/patches/patch-reachable.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-reachable.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- reachable.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ reachable.c
-@@ -43,15 +43,14 @@ static int add_one_ref(const char *path,
-  * The traversal will have already marked us as SEEN, so we
-  * only need to handle any progress reporting here.
-  */
--static void mark_object(struct object *obj, const struct name_path *path,
--			const char *name, void *data)
-+static void mark_object(struct object *obj, const char *name, void *data)
- {
- 	update_progress(data);
- }
- 
- static void mark_commit(struct commit *c, void *data)
- {
--	mark_object(&c->object, NULL, NULL, data);
-+	mark_object(&c->object, NULL, data);
- }
- 
- struct recent_data {
diff --git a/devel/git-base/patches/patch-revision.c b/devel/git-base/patches/patch-revision.c
deleted file mode 100644
index 8c251e19ed68e..0000000000000
--- a/devel/git-base/patches/patch-revision.c
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-revision.c,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- revision.c.orig	2016-03-10 22:11:15.000000000 +0000
-+++ revision.c
-@@ -25,69 +25,13 @@ volatile show_early_output_fn_t show_ear
- static const char *term_bad;
- static const char *term_good;
- 
--char *path_name(const struct name_path *path, const char *name)
-+void show_object_with_name(FILE *out, struct object *obj, const char *name)
- {
--	const struct name_path *p;
--	char *n, *m;
--	int nlen = strlen(name);
--	int len = nlen + 1;
--
--	for (p = path; p; p = p->up) {
--		if (p->elem_len)
--			len += p->elem_len + 1;
--	}
--	n = xmalloc(len);
--	m = n + len - (nlen + 1);
--	memcpy(m, name, nlen + 1);
--	for (p = path; p; p = p->up) {
--		if (p->elem_len) {
--			m -= p->elem_len + 1;
--			memcpy(m, p->elem, p->elem_len);
--			m[p->elem_len] = '/';
--		}
--	}
--	return n;
--}
--
--static int show_path_component_truncated(FILE *out, const char *name, int len)
--{
--	int cnt;
--	for (cnt = 0; cnt < len; cnt++) {
--		int ch = name[cnt];
--		if (!ch || ch == '\n')
--			return -1;
--		fputc(ch, out);
--	}
--	return len;
--}
--
--static int show_path_truncated(FILE *out, const struct name_path *path)
--{
--	int emitted, ours;
--
--	if (!path)
--		return 0;
--	emitted = show_path_truncated(out, path->up);
--	if (emitted < 0)
--		return emitted;
--	if (emitted)
--		fputc('/', out);
--	ours = show_path_component_truncated(out, path->elem, path->elem_len);
--	if (ours < 0)
--		return ours;
--	return ours || emitted;
--}
--
--void show_object_with_name(FILE *out, struct object *obj,
--			   const struct name_path *path, const char *component)
--{
--	struct name_path leaf;
--	leaf.up = (struct name_path *)path;
--	leaf.elem = component;
--	leaf.elem_len = strlen(component);
-+	const char *p;
- 
- 	fprintf(out, "%s ", oid_to_hex(&obj->oid));
--	show_path_truncated(out, &leaf);
-+	for (p = name; *p && *p != '\n'; p++)
-+		fputc(*p, out);
- 	fputc('\n', out);
- }
- 
diff --git a/devel/git-base/patches/patch-revision.h b/devel/git-base/patches/patch-revision.h
deleted file mode 100644
index 3c8bb951d6701..0000000000000
--- a/devel/git-base/patches/patch-revision.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-revision.h,v 1.1.2.2 2016/03/22 18:55:23 bsiegert Exp $
-
-CVE-2016-2324 via Debian
-https://security-tracker.debian.org/tracker/CVE-2016-2324
-https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d
-
---- revision.h.orig	2016-03-10 22:11:15.000000000 +0000
-+++ revision.h
-@@ -257,16 +257,9 @@ extern void put_revision_mark(const stru
- extern void mark_parents_uninteresting(struct commit *commit);
- extern void mark_tree_uninteresting(struct tree *tree);
- 
--struct name_path {
--	struct name_path *up;
--	int elem_len;
--	const char *elem;
--};
--
--char *path_name(const struct name_path *path, const char *name);
-+char *path_name(struct strbuf *path, const char *name);
- 
--extern void show_object_with_name(FILE *, struct object *,
--				  const struct name_path *, const char *);
-+extern void show_object_with_name(FILE *, struct object *, const char *);
- 
- extern void add_pending_object(struct rev_info *revs,
- 			       struct object *obj, const char *name);
diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile
index 86fddbf3417ee..be1a34b68dc64 100644
--- a/devel/git-docs/Makefile
+++ b/devel/git-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/04 05:56:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2016/07/21 13:12:25 wiz Exp $
 
 PKGNAME=	git-docs-${GIT_VERSION}
 COMMENT=	GIT Tree History Storage Tool (documentation)
diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST
index 4782b72034f67..88224955d390c 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/08/07 17:56:14 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -99,7 +99,6 @@ man/man1/git-read-tree.1
 man/man1/git-rebase.1
 man/man1/git-receive-pack.1
 man/man1/git-reflog.1
-man/man1/git-relink.1
 man/man1/git-remote-ext.1
 man/man1/git-remote-fd.1
 man/man1/git-remote-testgit.1
@@ -166,6 +165,7 @@ man/man7/giteveryday.7
 man/man7/gitglossary.7
 man/man7/gitnamespaces.7
 man/man7/gitrevisions.7
+man/man7/gitsubmodules.7
 man/man7/gittutorial-2.7
 man/man7/gittutorial.7
 man/man7/gitworkflows.7
diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST
index a645ccfbf3f7f..1325ad2cd435a 100644
--- a/devel/git-gitk/PLIST
+++ b/devel/git-gitk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/05/18 12:51:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
@@ -43,6 +43,7 @@ share/git-gui/lib/msgs/it.msg
 share/git-gui/lib/msgs/ja.msg
 share/git-gui/lib/msgs/nb.msg
 share/git-gui/lib/msgs/pt_br.msg
+share/git-gui/lib/msgs/pt_pt.msg
 share/git-gui/lib/msgs/ru.msg
 share/git-gui/lib/msgs/sv.msg
 share/git-gui/lib/msgs/vi.msg
@@ -72,6 +73,7 @@ share/gitk/lib/msgs/hu.msg
 share/gitk/lib/msgs/it.msg
 share/gitk/lib/msgs/ja.msg
 share/gitk/lib/msgs/pt_br.msg
+share/gitk/lib/msgs/pt_pt.msg
 share/gitk/lib/msgs/ru.msg
 share/gitk/lib/msgs/sv.msg
 share/gitk/lib/msgs/vi.msg
diff --git a/devel/git/Makefile.common b/devel/git/Makefile.common
index 1d6b7524224d5..c7ba03dbc83be 100644
--- a/devel/git/Makefile.common
+++ b/devel/git/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2015/07/10 17:31:35 khorben Exp $
+# $NetBSD: Makefile.common,v 1.6 2017/08/16 20:21:06 wiz Exp $
 #
 # used by devel/git-base/Makefile
 # used by devel/git-contrib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES?=	https://www.kernel.org/pub/software/scm/git/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
-HOMEPAGE?=	http://git-scm.com/
+HOMEPAGE?=	https://git-scm.com/
 LICENSE=	gnu-gpl-v2
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index f3953217677c3..135b75d2b6b26 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.version,v 1.35.2.1 2016/03/22 18:55:23 bsiegert Exp $
+# $NetBSD: Makefile.version,v 1.65 2017/11/30 07:50:01 adam Exp $
 #
 # used by devel/git/Makefile.common
+# used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.7.3
+GIT_VERSION=	2.15.1