From list at eworm.de  Wed Nov  3 14:33:50 2021
From: list at eworm.de (Christian Hesse)
Date: Wed,  3 Nov 2021 15:33:50 +0100
Subject: [PATCH 1/1] RFC: git: update to v2.34.0-rc0
Message-ID: <20211103143350.61461-1-list@eworm.de>

From: Christian Hesse <mail at 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 at 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

From list at eworm.de  Mon Nov 15 21:55:05 2021
From: list at eworm.de (Christian Hesse)
Date: Mon, 15 Nov 2021 22:55:05 +0100
Subject: [PATCH 1/1] git: update to v2.34.0
Message-ID: <20211115215505.58116-1-list@eworm.de>

From: Christian Hesse <mail at 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 at 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

From list at eworm.de  Tue Nov 16 11:33:01 2021
From: list at eworm.de (Christian Hesse)
Date: Tue, 16 Nov 2021 12:33:01 +0100
Subject: [PATCH 1/1] git: update to v2.34.0
In-Reply-To: <20211115215505.58116-1-list@eworm.de>
References: <20211115215505.58116-1-list@eworm.de>
Message-ID: <20211116123301.6ae89b03@leda>

Christian Hesse <list at eworm.de> on Mon, 2021/11/15 22:55:
> From: Christian Hesse <mail at 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);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20211116/98fdd333/attachment.sig>

From list at eworm.de  Wed Nov 24 20:14:17 2021
From: list at eworm.de (Christian Hesse)
Date: Wed, 24 Nov 2021 21:14:17 +0100
Subject: [PATCH 1/1] git: update to v2.34.1
Message-ID: <20211124201417.25940-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.34.1, no additional changes required.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9153a39..baa7c2d 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.34.0
+GIT_VER = 2.34.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index cd3e606..e9d7761 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
+Subproject commit e9d7761bb94f20acc98824275e317fa82436c25d