summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-05-30 10:28:12 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-06-27 18:01:29 +0200
commitfb804a353780633b23a5452b3893fcc9f3705431 (patch)
treed01fb03cd32a9fef277bedfb6b015f1cc19d1c12
parentb759189574971eabf98aee73b4e4e4c604e21a94 (diff)
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>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-shared.c2
3 files changed, 2 insertions, 2 deletions
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
-Subproject 2512f15446149235156528dafbe75930c712b29
+Subproject fc54c1af3ec09bab8b8ea09768c2da4069b7f53
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);
 }