about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2022-02-13 12:22:42 -0500
committerJune McEnroe <june@causal.agency>2022-02-13 12:24:41 -0500
commite4ce4fa747c246e1cfbad86c3e2b8e454146d211 (patch)
tree46ab68f7301b24184c6e2c84e0dcf0d3bbee10a3
parentSilence owner-info error (diff)
parentgit: update to v2.35.1 (diff)
downloadcgit-pink-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.tar.gz
cgit-pink-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.zip
Merge remote-tracking branch 'ch/git-2-35'
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 09fdd0e..5b96fe9 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.32.0
+GIT_VER = 2.35.1
 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 8a76c84..40a266b 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 ebf3c04b262aa27fbb97f8a0156c2347fecafaf
+Subproject 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1