From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: from lists.zx2c4.com (lists.zx2c4.com [165.227.139.114]) by inbox.vuxu.org (Postfix) with ESMTP id 86D6721F2D for ; Wed, 24 Apr 2024 22:36:58 +0200 (CEST) Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 1e49d27b; Wed, 24 Apr 2024 20:36:46 +0000 (UTC) Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [2a01:4f8:10b:ddb::25]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id c4291fd6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 24 Apr 2024 20:36:44 +0000 (UTC) Received: from leda.eworm.de (p5085a64a.dip0.t-ipconnect.de [80.133.166.74]) (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 7949226C4C8; Wed, 24 Apr 2024 22:36:44 +0200 (CEST) Received: by leda.eworm.de (Postfix, from userid 1000) id 015DC184124; Wed, 24 Apr 2024 22:36:43 +0200 (CEST) From: Christian Hesse To: cgit@lists.zx2c4.com Cc: Christian Hesse Subject: [PATCH 1/1] RFC: git: update to v2.45.0-rc1 Date: Wed, 24 Apr 2024 22:36:38 +0200 Message-ID: <20240424203638.48083-1-list@eworm.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240419204741.41191-1-list@eworm.de> References: <20240419204741.41191-1-list@eworm.de> 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.45.0-rc1, this requires changes for these upstream commits: * 9720d23e8caf4adee44b3a32803a9bb0480118bd date: make DATE_MODE thread-safe Signed-off-by: Christian Hesse --- Makefile | 4 ++-- git | 2 +- ui-shared.c | 4 ++-- ui-shared.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c3ee267..0654f70 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.44.0 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.45.0.rc1 +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/git b/git index 3c2a3fd..bf995e7 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0 +Subproject commit bf995e7a4f94a9388aa8042dc9e338f3fcb75496 diff --git a/ui-shared.c b/ui-shared.c index eef2aa8..d5b5b20 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -662,12 +662,12 @@ void cgit_submodule_link(const char *class, char *path, const char *rev) path[len - 1] = tail; } -const struct date_mode *cgit_date_mode(enum date_mode_type type) +const struct date_mode cgit_date_mode(enum date_mode_type type) { static struct date_mode mode; mode.type = type; mode.local = ctx.cfg.local_time; - return &mode; + return mode; } static void print_rel_date(time_t t, int tz, double value, diff --git a/ui-shared.h b/ui-shared.h index 6964873..f12fa99 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -65,7 +65,7 @@ __attribute__((format (printf,1,2))) extern void cgit_print_error(const char *fmt, ...); __attribute__((format (printf,1,0))) extern void cgit_vprint_error(const char *fmt, va_list ap); -extern const struct date_mode *cgit_date_mode(enum date_mode_type type); +extern const struct date_mode cgit_date_mode(enum date_mode_type type); extern void cgit_print_age(time_t t, int tz, time_t max_relative); extern void cgit_print_http_headers(void); extern void cgit_redirect(const char *url, bool permanent); -- 2.44.0