aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
m---------git0
-rw-r--r--ui-clone.c24
3 files changed, 16 insertions, 12 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
-Subproject 67ad42147a7acc2af6074753ebd03d904476118
+Subproject 2b39a27d40682c09ac1c031f099ee602061597c
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);
+ }
}
}
}