diff options
author | Christian Hesse | 2018-05-30 10:28:12 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2018-06-27 18:01:29 +0200 |
commit | fb804a353780633b23a5452b3893fcc9f3705431 (patch) | |
tree | d01fb03cd32a9fef277bedfb6b015f1cc19d1c12 | |
parent | ui-blame: free read_sha1_file() buffer after use (diff) | |
download | cgit-fb804a353780633b23a5452b3893fcc9f3705431.tar.gz cgit-fb804a353780633b23a5452b3893fcc9f3705431.zip |
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-- | Makefile | 2 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-shared.c | 2 |
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) | |||
14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
17 | GIT_VER = 2.16.0 | 17 | GIT_VER = 2.17.1 |
18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz |
19 | INSTALL = install | 19 | INSTALL = install |
20 | COPYTREE = cp -r | 20 | 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) | |||
545 | page = "tag"; | 545 | page = "tag"; |
546 | else | 546 | else |
547 | page = "blob"; | 547 | page = "blob"; |
548 | name = fmt("%s %s...", typename(obj->type), shortrev); | 548 | name = fmt("%s %s...", type_name(obj->type), shortrev); |
549 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 549 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
550 | } | 550 | } |
551 | 551 | ||