From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 4000 invoked from network); 3 Nov 2021 14:42:09 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 3 Nov 2021 14:42:09 -0000 Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 18331dd9; Wed, 3 Nov 2021 14:41:52 +0000 (UTC) Return-Path: Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [2a01:4f8:13a:16c2::25]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id 6e86e8fb (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Wed, 3 Nov 2021 14:41:50 +0000 (UTC) Received: from leda.eworm.de (unknown [193.159.163.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id 528D619028C; Wed, 3 Nov 2021 15:34:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eworm.de; s=mail; t=1635950065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1/gPAG+xQ7OLzg6kWzgdrnQnourYx10SjTynWHIZolA=; b=knf/K/feQOymiOwrbxZCGFYCNTpOM90vwNnx4Vnw3KHxMlQAZfpcuk0LwlxKOhel1GlDGo 958NLgDZrTH4bkFE0BIszA2/0/3SCNoJIqAi/F0Zg/w+pRBewbZDGpe+kgirM85HTqvCL0 uxX6BSLjMBpBWvRXm5+siFWwMe/16OM= Received: by leda.eworm.de (Postfix, from userid 1000) id E4C561A29F4; Wed, 3 Nov 2021 15:33:54 +0100 (CET) From: Christian Hesse To: cgit@lists.zx2c4.com Cc: Christian Hesse Subject: [PATCH 1/1] RFC: git: update to v2.34.0-rc0 Date: Wed, 3 Nov 2021 15:33:50 +0100 Message-Id: <20211103143350.61461-1-list@eworm.de> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mx.mylinuxtime.de; auth=pass smtp.auth=smtp-only@eworm.de smtp.mailfrom=eworm@leda.eworm.de X-Rspamd-Server: mx X-Stat-Signature: zkep6mo9kgxjinjr684cbkjo3trppxtd X-Rspamd-Queue-Id: 528D619028C X-Spamd-Result: default: False [-1.80 / 15.00]; ARC_NA(0.00)[]; GENERIC_REPUTATION(0.00)[-0.87419595372974]; URIBL_BLOCKED(0.00)[eworm.de:email,kernel.org:url]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-3.00)[-1.000]; DKIM_SIGNED(0.00)[eworm.de:s=mail]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; FORGED_SENDER(0.30)[list@eworm.de,eworm@leda.eworm.de]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3320, ipnet:193.158.0.0/15, country:DE]; FROM_NEQ_ENVFROM(0.00)[list@eworm.de,eworm@leda.eworm.de]; BAYES_HAM(-3.00)[99.99%] X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" From: Christian Hesse 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 --- 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 = -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