aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2026-04-13 08:18:52 +0200
committerChristian Hesse <mail@eworm.de>2026-04-20 21:52:25 +0200
commit9874f9d721765435b3a8183faec5daaaa42f2f28 (patch)
tree27edda0b6967d52f9552155b4b3d96c3a650eb17
parent829eb0711305e8946fa2f4a1c57c43354f35e208 (diff)
downloadcgit-9874f9d721765435b3a8183faec5daaaa42f2f28.tar.gz
cgit-9874f9d721765435b3a8183faec5daaaa42f2f28.tar.bz2
cgit-9874f9d721765435b3a8183faec5daaaa42f2f28.zip
git: update to v2.54.0
Update to git version v2.54.0, 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@eworm.de>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-clone.c24
3 files changed, 15 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 16bfc55..8a6b51a 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.53.0
+GIT_VER = 2.54.0
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
-Subproject 67ad42147a7acc2af6074753ebd03d904476118
+Subproject 94f057755b7941b321fd11fec1b2e3ca5313a4e
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);
+ }
}
}
}