List for cgit developers and users
 help / color / mirror / Atom feed
From: Christian Hesse <list@eworm.de>
To: cgit@lists.zx2c4.com
Cc: Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] git: update to v2.34.0
Date: Mon, 15 Nov 2021 22:55:05 +0100	[thread overview]
Message-ID: <20211115215505.58116-1-list@eworm.de> (raw)

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

             reply	other threads:[~2021-11-15 22:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-15 21:55 Christian Hesse [this message]
2021-11-16 11:33 ` Christian Hesse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211115215505.58116-1-list@eworm.de \
    --to=list@eworm.de \
    --cc=cgit@lists.zx2c4.com \
    --cc=mail@eworm.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).