[PATCH 1/1] git: update to v2.17.0

Christian Hesse list at eworm.de
Mon Apr 2 23:13:45 CEST 2018


From: Christian Hesse <mail at eworm.de>

Update to git version v2.17.0. Required changes:

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

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile    | 2 +-
 git         | 2 +-
 ui-shared.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 59e5c25..4464f70 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.3
+GIT_VER = 2.17.0
 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 d32eb83..468165c 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d32eb83c1db7d0a8bb54fe743c6d1dd674d372c5
+Subproject commit 468165c1d8a442994a825f3684528361727cd8c0
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);
 }
 


More information about the CGit mailing list