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.3 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2024 invoked from network); 15 Aug 2023 20:29:47 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 15 Aug 2023 20:29:47 -0000 Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 385202a6; Tue, 15 Aug 2023 20:29:30 +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 168a0941 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 15 Aug 2023 20:29:28 +0000 (UTC) Received: from leda.eworm.de (p5085a642.dip0.t-ipconnect.de [80.133.166.66]) (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 9531520CB4D; Tue, 15 Aug 2023 22:29:27 +0200 (CEST) Received: by leda.eworm.de (Postfix, from userid 1000) id A7E811849D3; Tue, 15 Aug 2023 22:29:26 +0200 (CEST) From: Christian Hesse To: cgit@lists.zx2c4.com Cc: Christian Hesse Subject: [PATCH 1/1] RFC: git: update to v2.42.0-rc2 Date: Tue, 15 Aug 2023 22:29:24 +0200 Message-ID: <20230815202924.20034-1-list@eworm.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.42.0-rc2, this requires changes for these upstream commits: * bc5c5ec0446895f5c4139cd470066beb3c4ac6d5 cache.h: remove this no-longer-used header * aba070683295a20bdf4f49146384984961c794b2 path: move related function to path * a4e7e317f8f27f861321e6eb08b9c8c0f3ab570c config: add ctx arg to config_fn_t Signed-off-by: Christian Hesse --- Makefile | 4 ++-- cgit.h | 2 +- git | 2 +- scan-tree.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b0de0ee..974d9ba 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.41.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.42.0.rc2 +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.h b/cgit.h index f788fd2..dbc461f 100644 --- a/cgit.h +++ b/cgit.h @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/git b/git index fe86abd..f1ed9d7 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09 +Subproject commit f1ed9d7dc0e49dc1a044941d821c9d2342313c26 diff --git a/scan-tree.c b/scan-tree.c index 6a2f65a..84da86e 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -54,7 +54,7 @@ static void scan_tree_repo_config(const char *name, const char *value) config_fn(repo, name, value); } -static int gitconfig_config(const char *key, const char *value, void *cb) +static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb) { const char *name; -- 2.41.0