List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] git: update to v2.34.0
@ 2021-11-15 21:55 Christian Hesse
  2021-11-16 11:33 ` Christian Hesse
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Hesse @ 2021-11-15 21:55 UTC (permalink / raw)
  To: cgit; +Cc: Christian Hesse

From: Christian Hesse <mail@eworm.de>

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>
---
 Makefile | 2 +-
 cgit.c   | 2 +-
 git      | 2 +-
 3 files changed, 3 insertions(+), 3 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
index 225bc32..cd3e606 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
+Subproject commit cd3e606211bb1cf8bc57f7d76bab98cc17a150bc

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] git: update to v2.34.0
  2021-11-15 21:55 [PATCH 1/1] git: update to v2.34.0 Christian Hesse
@ 2021-11-16 11:33 ` Christian Hesse
  0 siblings, 0 replies; 2+ messages in thread
From: Christian Hesse @ 2021-11-16 11:33 UTC (permalink / raw)
  To: cgit

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

Christian Hesse <list@eworm.de> on Mon, 2021/11/15 22:55:
> From: Christian Hesse <mail@eworm.de>
> 
> Update to git version v2.34.0, this requires changes for these
> upstream commits:
> 
> * abf897bacd2d36b9dbd07c70b4a2f97a084704ee
>   string-list.[ch]: remove string_list_init() compatibility function

This contains a breaking change, can we fast-forward in master?
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-16 11:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-15 21:55 [PATCH 1/1] git: update to v2.34.0 Christian Hesse
2021-11-16 11:33 ` 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).