summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-04-02 23:09:01 +0200
committerChristian Hesse <mail@eworm.de>2018-04-02 23:09:01 +0200
commit3e7e7a886006376ba68e959addaea1eabbb37482 (patch)
treedae8316113ba194a7afd3e7dd484a666fb5f502e
parent99497436a06605bb6f3e9ba8b3d50d282f873fdd (diff)
downloadcgit-ch/git-2-17-0.tar.gz
git: update to v2.17.0ch/git-2-17-0
Update to git version v2.17.0. Required changes: * The function 'typename' has been renamed to 'type_name' (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)
-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 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
-Subproject d32eb83c1db7d0a8bb54fe743c6d1dd674d372c
+Subproject 468165c1d8a442994a825f3684528361727cd8c
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);
}