[PATCH 1/3] git: update to v2.46.1

[PATCH 1/3] git: update to v2.46.1

[Yasuhiro Kimura]

Update to git version v2.46.1, no additional changes required.
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7f8a5cb..9e595b8 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.0
+GIT_VER = 2.46.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 39bf06a..a731929 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 39bf06adf96da25b87c9aa7d35a32ef3683eb4a4
+Subproject commit a731929aa8016750c09bccc67c68feaf1259ce90
-- 
2.47.0

[PATCH 2/3] git: update to v2.46.2

[Yasuhiro Kimura]

Update to git version v2.46.2, no additional changes required.
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9e595b8..fe15c2c 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.1
+GIT_VER = 2.46.2
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index a731929..4f71522 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit a731929aa8016750c09bccc67c68feaf1259ce90
+Subproject commit 4f71522dfb7fc53eff569023303980c66114b1bc
-- 
2.47.0

[PATCH 3/3] git: update to v2.47.0

[Yasuhiro Kimura]

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

Re: [PATCH 3/3] git: update to v2.47.0

[Christian Hesse]

[-- Attachment #1: Type: text/plain, Size: 790 bytes --]

Yasuhiro Kimura <yasu@utahime.org> on Fri, 2024/11/01 13:56:
> Update to git version v2.47.0, this requires changes for these
> upstream commits:

All of this had been ready already... Though mails did not make it to the
mailing list. Before doing any future work you should have a look at the
upstream git repository [0], and specifically at my branches as I do most of
the maintenance work at least. Currently these commit are in ch/for-jason [1]
already.

[0] https://git.zx2c4.com/cgit/
[1] https://git.zx2c4.com/cgit/log/?h=ch/for-jason
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]