about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2021-11-03 15:32:17 +0100
committerChristian Hesse <mail@eworm.de>2021-11-15 22:53:04 +0100
commitb8f2b675df61e3a4ff4db7073fe7142fc07e8b7a (patch)
treea3ec88fc35dc1e2ff7d87b1baed53c815a79d2d6
parentgit: update to v2.33.0 (diff)
downloadcgit-pink-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.tar.gz
cgit-pink-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.zip
git: update to v2.34.0
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>
Diffstat (limited to '')
-rw-r--r--Makefile2
-rw-r--r--cgit.c2
m---------git0
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b030ff9..9153a39 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.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 08d81a1..4b2d86c 100644
--- 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
-Subproject 225bc32a989d7a22fa6addafd4ce7dcd04675db
+Subproject cd3e606211bb1cf8bc57f7d76bab98cc17a150b