packfile: allow prepare_packed_git_one to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Mar 23, 2018 at 18:45 UTC
935cdd6922e40f5812cdcf2741d274ab2fc110a6
1 file changed
+3
-4
packfile.c
+3
-4
@@ -735,8 +735,7 @@ static void report_pack_garbage(struct string_list *list)
735
report_helper(list, seen_bits, first, list->nr);
736
}
737
738
-#define prepare_packed_git_one(r, o, l) prepare_packed_git_one_##r(o, l)
739
-static void prepare_packed_git_one_the_repository(char *objdir, int local)
738
+static void prepare_packed_git_one(struct repository *r, char *objdir, int local)
739
{
740
struct strbuf path = STRBUF_INIT;
741
size_t dirnamelen;
@@ -769,7 +768,7 @@ static void prepare_packed_git_one_the_repository(char *objdir, int local)
768
base_len = path.len;
769
if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
770
/* Don't reopen a pack we already have. */
772
- for (p = the_repository->objects->packed_git; p;
771
+ for (p = r->objects->packed_git; p;
772
p = p->next) {
773
size_t len;
774
if (strip_suffix(p->pack_name, ".pack", &len) &&
@@ -783,7 +782,7 @@ static void prepare_packed_git_one_the_repository(char *objdir, int local)
782
* corresponding .pack file that we can map.
783
*/
784
(p = add_packed_git(path.buf, path.len, local)) != NULL)
786
- install_packed_git(the_repository, p);
785
+ install_packed_git(r, p);
786
}
787
788
if (!report_garbage)