]> git.cameronkatri.com Git - cgit.git/commitdiff
git: update to v2.17.1
authorChristian Hesse <mail@eworm.de>
Wed, 30 May 2018 08:28:12 +0000 (10:28 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Wed, 27 Jun 2018 16:01:29 +0000 (18:01 +0200)
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>
Makefile
git
ui-shared.c

index 70f32a4381452452127e4d9e1f29181e104c160d..be2ed4f0c447a86bd0a7cc00a50076da5699b5b5 100644 (file)
--- 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.0
+GIT_VER = 2.17.1
 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 2512f15446149235156528dafbe75930c712b29e..fc54c1af3ec09bab8b8ea09768c2da4069b7f53e 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 2512f15446149235156528dafbe75930c712b29e
+Subproject commit fc54c1af3ec09bab8b8ea09768c2da4069b7f53e
index 9d8f66b9fab89ad63e5bfaac22eb6956567f10dd..ce806f6f4acefbeadf829d18cafe54d527122029 100644 (file)
@@ -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);
 }