* [PATCH 1/1] RFC: git: update to v2.34.0-rc0
@ 2021-11-03 14:33 Christian Hesse
0 siblings, 0 replies; only message in thread
From: Christian Hesse @ 2021-11-03 14:33 UTC (permalink / raw)
To: cgit; +Cc: Christian Hesse
From: Christian Hesse <mail@eworm.de>
Update to git version v2.34.0-rc0, 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>
---
Makefile | 4 ++--
cgit.c | 2 +-
git | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index b030ff9..10c4b02 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.33.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.34.0-rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
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
index 225bc32..7e27bd5 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
+Subproject commit 7e27bd589d328b9daf154c2444d1a86ec3afedb0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-03 14:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-03 14:33 [PATCH 1/1] RFC: git: update to v2.34.0-rc0 Christian Hesse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).