From: Christian Hesse <mail@eworm.de>
Date: Wed, 30 May 2018 08:28:12 +0000 (+0200)
Subject: git: update to v2.17.1
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/fb804a353780633b23a5452b3893fcc9f3705431

git: update to v2.17.1

Update to git version v2.17.1. Required changes:

* The function 'typename' has been renamed to 'type_name'
  (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)

Signed-off-by: Christian Hesse <mail@eworm.de>
---

diff --git a/Makefile b/Makefile
index 70f32a4..be2ed4f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.16.0
+GIT_VER = 2.17.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 2512f15..fc54c1a 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 2512f15446149235156528dafbe75930c712b29e
+Subproject commit fc54c1af3ec09bab8b8ea09768c2da4069b7f53e
diff --git a/ui-shared.c b/ui-shared.c
index 9d8f66b..ce806f6 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj)
 		page = "tag";
 	else
 		page = "blob";
-	name = fmt("%s %s...", typename(obj->type), shortrev);
+	name = fmt("%s %s...", type_name(obj->type), shortrev);
 	reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }