aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2021-11-03 15:32:17 +0100
committerYigit Sever2023-07-21 03:03:47 +0300
commitb4ab963ae1799721ba9364acbb2258345f13ce2c (patch)
tree296dcea26edcf46fbb46890640dfa3c039aea5c4
parent8d0aa0873fcd711dbc39b84dd2ffc3721c9c8e54 (diff)
downloadcgit-b4ab963ae1799721ba9364acbb2258345f13ce2c.tar.gz
cgit-b4ab963ae1799721ba9364acbb2258345f13ce2c.tar.bz2
cgit-b4ab963ae1799721ba9364acbb2258345f13ce2c.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>
-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 f0ab02a..dae11c6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.33.0 17GIT_VER = 2.34.0
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = 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