summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-03-22 23:40:08 +0100
committerChristian Hesse <mail@eworm.de>2018-03-22 23:40:08 +0100
commita5c43cd099a10c2fefec028130ee4a8c8d1d9ac6 (patch)
treefc7ee0e838a8d9cf1a6d280e5a31fbe4afb8630f
parent33414d7869aa55aaccd45cdb82268d454cb79863 (diff)
downloadcgit-ch/git-2-17-0-rc1.tar.gz
RFC: git: update to v2.17.0.rc1ch/git-2-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)
-rw-r--r--Makefile4
m---------git0
-rw-r--r--ui-shared.c2
3 files changed, 3 insertions, 3 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 = <openssl/sha.h>
-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
-Subproject 2512f15446149235156528dafbe75930c712b29
+Subproject 085f5f95a2723e8f9f4d037c01db5b786355ba4
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);
}