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.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 BC8C42F85A for ; Mon, 18 Nov 2024 04:46:30 +0100 (CET) Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 013eea8f; Mon, 18 Nov 2024 01:39:07 +0000 (UTC) Received: from gate.home.utahime.org (gate.home.utahime.org [111.108.18.121]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id d0e74ff3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 1 Nov 2024 04:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=utahime.org; i=@utahime.org; q=dns/txt; s=maybe2024061701; t=1730437016; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=/NDjA7cKFG2D0IT+yw86xgNS75kNJrKk0PCKV/pdp2k=; b=Vb65H1ZmLD4cxqmoUzJs4gy7tC9T9R1nlOH+5NEjgOIaryCNs76oBxZVBkPgUW+d85SyG gUUax3tobMqciyaXMrLqsXFbKV2kN8YPJgy3wPnKHvNqu1IFcqsddehPL54oag9u3QpxNLb k0sL6KbsIWrtIeqV7+uuquCHSBTwmj/fcrFnttUVczgk17I5BX54WiCMzSsyEmBbTJRfy+6 5i7EUcw/eR4a6vNfeC88nQY2TRi2BCYgwZzVg6ynKIjxITyPCf20Lw6GWYS0Mvn6soXwwRB EFLDOo4t7mKhapA7PIPu30BKGF+YUKN1Oj04XDs3euZ1rUT1ZAxarq9JjACQ== Authentication-Results: gate.home.utahime.org; arc=none (no signatures found); dkim=pass (2048-bit rsa key sha256) header.d=utahime.org header.i=@utahime.org header.b=Vb65H1Zm header.a=rsa-sha256 header.s=maybe2024061701; x-trusted-ip=pass Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [IPv6:240b:11:220:fe00::174:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by gate.home.utahime.org (Postfix) with ESMTPS id EF4B222C6C for ; Fri, 01 Nov 2024 13:56:56 +0900 (JST) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [IPv6:240b:11:220:fe00::174:1]) by eastasia.home.utahime.org (Postfix) with ESMTP id 5E7EFCBD2; Fri, 01 Nov 2024 13:56:56 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 1.4.1 at eastasia.home.utahime.org From: Yasuhiro Kimura To: cgit@lists.zx2c4.com Subject: [PATCH 3/3] git: update to v2.47.0 Date: Fri, 1 Nov 2024 13:56:33 +0900 Message-ID: <20241101045633.57275-3-yasu@utahime.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241101045633.57275-1-yasu@utahime.org> References: <20241101045633.57275-1-yasu@utahime.org> 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" Update to git version v2.47.0, this requires changes for these upstream commits: * e8207717f1623325fe1c95338fb03c1104ed5687 refs: add referent to each_ref_fn --- Makefile | 2 +- cgit.c | 2 +- cgit.h | 2 +- git | 2 +- shared.c | 2 +- ui-clone.c | 2 +- ui-shared.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fe15c2c..27b50ee 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.46.2 +GIT_VER = 2.47.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 2efa962..ab0bb8a 100644 --- a/cgit.c +++ b/cgit.c @@ -448,7 +448,7 @@ struct refmatch { int match; }; -static int find_current_ref(const char *refname, const struct object_id *oid, +static int find_current_ref(const char *refname, const char *refent, const struct object_id *oid, int flags, void *cb_data) { struct refmatch *info; diff --git a/cgit.h b/cgit.h index e0d286d..c2accfd 100644 --- a/cgit.h +++ b/cgit.h @@ -346,7 +346,7 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c); extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); extern void cgit_free_reflist_inner(struct reflist *list); -extern int cgit_refs_cb(const char *refname, const struct object_id *oid, +extern int cgit_refs_cb(const char *refname, const char *referent, const struct object_id *oid, int flags, void *cb_data); extern void cgit_free_commitinfo(struct commitinfo *info); diff --git a/git b/git index 4f71522..777489f 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 4f71522dfb7fc53eff569023303980c66114b1bc +Subproject commit 777489f9e09c8d0dd6b12f9d90de6376330577a2 diff --git a/shared.c b/shared.c index ae3f6c1..36ee706 100644 --- a/shared.c +++ b/shared.c @@ -212,7 +212,7 @@ void cgit_free_reflist_inner(struct reflist *list) free(list->refs); } -int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags, +int cgit_refs_cb(const char *refname, const char *referent, const struct object_id *oid, int flags, void *cb_data) { struct reflist *list = (struct reflist *)cb_data; diff --git a/ui-clone.c b/ui-clone.c index df196a0..282d1e1 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -16,7 +16,7 @@ #include "packfile.h" #include "object-store.h" -static int print_ref_info(const char *refname, const struct object_id *oid, +static int print_ref_info(const char *refname, const char *referent, const struct object_id *oid, int flags, void *cb_data) { struct object *obj; diff --git a/ui-shared.c b/ui-shared.c index 6fae72d..fede04e 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -936,7 +936,7 @@ void cgit_add_clone_urls(void (*fn)(const char *)) add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url); } -static int print_branch_option(const char *refname, const struct object_id *oid, +static int print_branch_option(const char *refname, const char *referent, const struct object_id *oid, int flags, void *cb_data) { char *name = (char *)refname; -- 2.47.0