From list at eworm.de Mon Nov 3 21:12:18 2025 From: list at eworm.de (Christian Hesse) Date: Mon, 3 Nov 2025 22:12:18 +0100 Subject: [PATCH 1/1] RFC: git: update to v2.52.0-rc0 Message-ID: <20251103211218.31717-1-list@eworm.de> From: Christian Hesse Update to git version v2.52.0-rc0, this requires changes for these upstream commits: * 9f6dfe43c8a55b833ae16486bcafe29b543461f9 string-list: align string_list_split() with its _in_place() counterpart * 78237ea53d6546aeab7adb2c7547a1177311ccde packfile: split up responsibilities of `reprepare_packed_git()` * 751808b2a18acba76b824aed4d8b7442bd7f5fca packfile: refactor `get_packed_git()` to work on packfile store Signed-off-by: Christian Hesse --- Makefile | 4 ++-- git | 2 +- shared.c | 2 +- ui-clone.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08b4c90..3e57e1e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.51.2 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.52.0.rc0 +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 bb5c624..7f278e9 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit bb5c624209fcaebd60b9572b2cc8c61086e39b57 +Subproject commit 7f278e958afbf9b7e0727631b4c26dcfa1c63d6e diff --git a/shared.c b/shared.c index 3838364..401cf86 100644 --- a/shared.c +++ b/shared.c @@ -395,7 +395,7 @@ int cgit_parse_snapshots_mask(const char *str) if (strcmp(str, "all") == 0) return INT_MAX; - string_list_split(&tokens, str, ' ', -1); + string_list_split(&tokens, str, " ", -1); string_list_remove_empty_items(&tokens, 0); for_each_string_list_item(item, &tokens) { diff --git a/ui-clone.c b/ui-clone.c index 0fadf24..9445454 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -40,8 +40,8 @@ static void print_pack_info(void) ctx.page.mimetype = "text/plain"; ctx.page.filename = "objects/info/packs"; cgit_print_http_headers(); - reprepare_packed_git(the_repository); - for (pack = get_packed_git(the_repository); pack; pack = pack->next) { + odb_reprepare(the_repository->objects); + for (pack = packfile_store_get_packs(the_repository->objects->packfiles); pack; pack = pack->next) { if (pack->pack_local) { offset = strrchr(pack->pack_name, '/'); if (offset && offset[1] != '\0') From list at eworm.de Tue Nov 11 13:23:50 2025 From: list at eworm.de (Christian Hesse) Date: Tue, 11 Nov 2025 14:23:50 +0100 Subject: [PATCH 1/1] RFC: git: update to v2.52.0-rc1 In-Reply-To: <20251103211218.31717-1-list@eworm.de> References: <20251103211218.31717-1-list@eworm.de> Message-ID: <20251111132350.163215-1-list@eworm.de> From: Christian Hesse Update to git version v2.52.0-rc1, this requires changes for these upstream commits: * 9f6dfe43c8a55b833ae16486bcafe29b543461f9 string-list: align string_list_split() with its _in_place() counterpart * 78237ea53d6546aeab7adb2c7547a1177311ccde packfile: split up responsibilities of `reprepare_packed_git()` * 751808b2a18acba76b824aed4d8b7442bd7f5fca packfile: refactor `get_packed_git()` to work on packfile store Signed-off-by: Christian Hesse --- Makefile | 4 ++-- git | 2 +- shared.c | 2 +- ui-clone.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08b4c90..2a5ca0e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.51.2 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.52.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 bb5c624..77b7284 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit bb5c624209fcaebd60b9572b2cc8c61086e39b57 +Subproject commit 77b7284ccab768981a2cd08b6b2f164d91201e18 diff --git a/shared.c b/shared.c index 3838364..401cf86 100644 --- a/shared.c +++ b/shared.c @@ -395,7 +395,7 @@ int cgit_parse_snapshots_mask(const char *str) if (strcmp(str, "all") == 0) return INT_MAX; - string_list_split(&tokens, str, ' ', -1); + string_list_split(&tokens, str, " ", -1); string_list_remove_empty_items(&tokens, 0); for_each_string_list_item(item, &tokens) { diff --git a/ui-clone.c b/ui-clone.c index 0fadf24..9445454 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -40,8 +40,8 @@ static void print_pack_info(void) ctx.page.mimetype = "text/plain"; ctx.page.filename = "objects/info/packs"; cgit_print_http_headers(); - reprepare_packed_git(the_repository); - for (pack = get_packed_git(the_repository); pack; pack = pack->next) { + odb_reprepare(the_repository->objects); + for (pack = packfile_store_get_packs(the_repository->objects->packfiles); pack; pack = pack->next) { if (pack->pack_local) { offset = strrchr(pack->pack_name, '/'); if (offset && offset[1] != '\0') From list at eworm.de Wed Nov 12 21:53:35 2025 From: list at eworm.de (Christian Hesse) Date: Wed, 12 Nov 2025 22:53:35 +0100 Subject: [PATCH 1/1] RFC: git: update to v2.52.0-rc2 In-Reply-To: <20251111132350.163215-1-list@eworm.de> References: <20251111132350.163215-1-list@eworm.de> Message-ID: <20251112215335.27481-1-list@eworm.de> From: Christian Hesse Update to git version v2.52.0-rc2, this requires changes for these upstream commits: * 9f6dfe43c8a55b833ae16486bcafe29b543461f9 string-list: align string_list_split() with its _in_place() counterpart * 78237ea53d6546aeab7adb2c7547a1177311ccde packfile: split up responsibilities of `reprepare_packed_git()` * 751808b2a18acba76b824aed4d8b7442bd7f5fca packfile: refactor `get_packed_git()` to work on packfile store Signed-off-by: Christian Hesse --- Makefile | 4 ++-- git | 2 +- shared.c | 2 +- ui-clone.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08b4c90..76fc068 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.51.2 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.52.0.rc2 +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 bb5c624..621415c 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit bb5c624209fcaebd60b9572b2cc8c61086e39b57 +Subproject commit 621415c8b5371a4734315232a780dd8282f6fe4f diff --git a/shared.c b/shared.c index 3838364..401cf86 100644 --- a/shared.c +++ b/shared.c @@ -395,7 +395,7 @@ int cgit_parse_snapshots_mask(const char *str) if (strcmp(str, "all") == 0) return INT_MAX; - string_list_split(&tokens, str, ' ', -1); + string_list_split(&tokens, str, " ", -1); string_list_remove_empty_items(&tokens, 0); for_each_string_list_item(item, &tokens) { diff --git a/ui-clone.c b/ui-clone.c index 0fadf24..9445454 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -40,8 +40,8 @@ static void print_pack_info(void) ctx.page.mimetype = "text/plain"; ctx.page.filename = "objects/info/packs"; cgit_print_http_headers(); - reprepare_packed_git(the_repository); - for (pack = get_packed_git(the_repository); pack; pack = pack->next) { + odb_reprepare(the_repository->objects); + for (pack = packfile_store_get_packs(the_repository->objects->packfiles); pack; pack = pack->next) { if (pack->pack_local) { offset = strrchr(pack->pack_name, '/'); if (offset && offset[1] != '\0')