[PATCH 1/1] RFC: git: update to v2.54.0-rc1

[Christian Hesse]

From: Christian Hesse <mail at eworm.de>

Update to git version v2.54.0-rc1, this requires changes for these
upstream commits:

* d9ecf268ef3f69130fa269012318470d908978f6
  odb: embed base source in the "files" backend

* cb506a8a69c953f7b87bb3ae099e0bed8218d3ab
  odb: introduce "files" source

... and probably more related.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile   |  4 ++--
 git        |  2 +-
 ui-clone.c | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 16bfc55..e1db470 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.53.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.54.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 67ad421..2b39a27 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 67ad42147a7acc2af6074753ebd03d904476118f
+Subproject commit 2b39a27d40682c09ac1c031f099ee602061597cd
diff --git a/ui-clone.c b/ui-clone.c
index 5a1fab3..e11f496 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -33,22 +33,26 @@ static int print_ref_info(const struct reference *ref, void *cb_data)
 
 static void print_pack_info(void)
 {
-	struct packfile_list_entry *e;
+	struct odb_source *source;
 	char *offset;
 
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = "objects/info/packs";
 	cgit_print_http_headers();
 	odb_reprepare(the_repository->objects);
-	for (e = packfile_store_get_packs(the_repository->objects->sources->packfiles); e; e = e->next) {
-		struct packed_git *p = e->pack;
-		if (p->pack_local) {
-			offset = strrchr(p->pack_name, '/');
-			if (offset && offset[1] != '\0')
-				++offset;
-			else
-				offset = p->pack_name;
-			htmlf("P %s\n", offset);
+	for (source = the_repository->objects->sources; source; source = source->next) {
+		struct odb_source_files *files = odb_source_files_downcast(source);
+		struct packfile_list_entry *e;
+		for (e = files->packed->packs.head; e; e = e->next) {
+			struct packed_git *p = e->pack;
+			if (p->pack_local) {
+				offset = strrchr(p->pack_name, '/');
+				if (offset && offset[1] != '\0')
+					++offset;
+				else
+					offset = p->pack_name;
+				htmlf("P %s\n", offset);
+			}
 		}
 	}
 }