From a5c43cd099a10c2fefec028130ee4a8c8d1d9ac6 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 22 Mar 2018 23:40:08 +0100 Subject: RFC: git: update to v2.17.0.rc1 Update to git version v2.17.0.rc1. Required changes: * The function 'typename' has been renamed to 'type_name' (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb) --- Makefile | 4 ++-- git | 2 +- ui-shared.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 687069f..a7967d9 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.16.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz +GIT_VER = 2.17.0.rc1 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 2512f15..085f5f9 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 2512f15446149235156528dafbe75930c712b29e +Subproject commit 085f5f95a2723e8f9f4d037c01db5b786355ba49 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); } -- cgit v1.2.1