Merge remote-tracking branch 'ch/git-2-35'

author: June McEnroe 2022-02-13 12:22:42 -0500
committer: June McEnroe 2022-02-13 12:24:41 -0500
commit: e4ce4fa747c246e1cfbad86c3e2b8e454146d211 (patch)
tree: 46ab68f7301b24184c6e2c84e0dcf0d3bbee10a3
parent: Silence owner-info error (diff)
parent: git: update to v2.35.1 (diff)
download: cgit-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.tar.gz
cgit-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.zip
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
author	June McEnroe	2022-02-13 12:22:42 -0500
committer	June McEnroe	2022-02-13 12:24:41 -0500
commit	e4ce4fa747c246e1cfbad86c3e2b8e454146d211 (patch)
tree	46ab68f7301b24184c6e2c84e0dcf0d3bbee10a3
parent	Silence owner-info error (diff)
parent	git: update to v2.35.1 (diff)
download	cgit-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.tar.gz cgit-e4ce4fa747c246e1cfbad86c3e2b8e454146d211.zip

diff --git a/Makefile b/Makefile index 09fdd0e..5b96fe9 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.32.0	17	GIT_VER = 2.35.1
18	GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz	18	GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
19	INSTALL = install	19	INSTALL = install
20	COPYTREE = cp -r	20	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)
428	ctx.page.modified = time(NULL);	428	ctx.page.modified = time(NULL);
429	ctx.page.expires = ctx.page.modified;	429	ctx.page.expires = ctx.page.modified;
430	ctx.page.etag = NULL;	430	ctx.page.etag = NULL;
431	string_list_init(&ctx.cfg.mimetypes, 1);	431	string_list_init_dup(&ctx.cfg.mimetypes);
432	if (ctx.env.script_name)	432	if (ctx.env.script_name)
433	ctx.cfg.script_name = xstrdup(ctx.env.script_name);	433	ctx.cfg.script_name = xstrdup(ctx.env.script_name);
434	if (ctx.env.query_string)	434	if (ctx.env.query_string)


diff --git a/git b/git
	Subproject ebf3c04b262aa27fbb97f8a0156c2347fecafaf		Subproject 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1