]> granicus.if.org Git - cgit/commitdiff
git: update to v2.34.0
authorChristian Hesse <mail@eworm.de>
Wed, 3 Nov 2021 14:32:17 +0000 (15:32 +0100)
committerChristian Hesse <mail@eworm.de>
Mon, 15 Nov 2021 21:53:04 +0000 (22:53 +0100)
Update to git version v2.34.0, this requires changes for these
upstream commits:

abf897bacd2d36b9dbd07c70b4a2f97a084704ee
  string-list.[ch]: remove string_list_init() compatibility function

Signed-off-by: Christian Hesse <mail@eworm.de>
Makefile
cgit.c
git

index b030ff926216e120daf146be049858a6885b2fb1..9153a393f770c8847b9f712e46576f1ea5a7d850 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.33.0
+GIT_VER = 2.34.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/cgit.c b/cgit.c
index 08d81a1d4b632af9b725a0a2dbf553cff4d3e6b7..4b2d86c88129c871a41fd15727e5e61c1ef49359 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -428,7 +428,7 @@ static void prepare_context(void)
        ctx.page.modified = time(NULL);
        ctx.page.expires = ctx.page.modified;
        ctx.page.etag = NULL;
-       string_list_init(&ctx.cfg.mimetypes, 1);
+       string_list_init_dup(&ctx.cfg.mimetypes);
        if (ctx.env.script_name)
                ctx.cfg.script_name = xstrdup(ctx.env.script_name);
        if (ctx.env.query_string)
diff --git a/git b/git
index 225bc32a989d7a22fa6addafd4ce7dcd04675dbf..cd3e606211bb1cf8bc57f7d76bab98cc17a150bc 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
+Subproject commit cd3e606211bb1cf8bc57f7d76bab98cc17a150bc