List for cgit developers and users
 help / color / mirror / Atom feed
From: Yasuhiro Kimura <yasu@utahime.org>
To: cgit@lists.zx2c4.com
Subject: [PATCH 3/3] git: update to v2.47.0
Date: Fri,  1 Nov 2024 13:56:33 +0900	[thread overview]
Message-ID: <20241101045633.57275-3-yasu@utahime.org> (raw)
In-Reply-To: <20241101045633.57275-1-yasu@utahime.org>

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 = <openssl/sha.h>
-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


  parent reply	other threads:[~2024-11-18  3:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-01  4:56 [PATCH 1/3] git: update to v2.46.1 Yasuhiro Kimura
2024-11-01  4:56 ` [PATCH 2/3] git: update to v2.46.2 Yasuhiro Kimura
2024-11-01  4:56 ` Yasuhiro Kimura [this message]
2024-11-19  8:45   ` [PATCH 3/3] git: update to v2.47.0 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=20241101045633.57275-3-yasu@utahime.org \
    --to=yasu@utahime.org \
    --cc=cgit@lists.zx2c4.com \
    /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).