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>
author: Christian Hesse 2021-11-03 15:32:17 +0100
committer: Christian Hesse 2021-11-15 22:53:04 +0100
commit: b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a (patch)
tree: a3ec88fc35dc1e2ff7d87b1baed53c815a79d2d6
parent: git: update to v2.33.0 (diff)
download: cgit-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.tar.gz
cgit-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.zip
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
author	Christian Hesse	2021-11-03 15:32:17 +0100
committer	Christian Hesse	2021-11-15 22:53:04 +0100
commit	b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a (patch)
tree	a3ec88fc35dc1e2ff7d87b1baed53c815a79d2d6
parent	git: update to v2.33.0 (diff)
download	cgit-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.tar.gz cgit-b8f2b675df61e3a4ff4db7073fe7142fc07e8b7a.zip

diff --git a/Makefile b/Makefile index b030ff9..9153a39 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.33.0	17	GIT_VER = 2.34.0
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 08d81a1..4b2d86c 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 225bc32a989d7a22fa6addafd4ce7dcd04675db		Subproject cd3e606211bb1cf8bc57f7d76bab98cc17a150b