diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-03-23 18:45:22 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-26 10:07:43 -0700 |
| commit | 935cdd6922e40f5812cdcf2741d274ab2fc110a6 (patch) | |
| tree | 221c1c9ebbbfa7e60b72e3400d817aabb7e51ffd | |
| parent | packfile: add repository argument to reprepare_packed_git (diff) | |
| download | tgif-935cdd6922e40f5812cdcf2741d274ab2fc110a6.tar.xz | |
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>
| -rw-r--r-- | packfile.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packfile.c b/packfile.c index 210fcb3db4..fd6aa54b4b 100644 --- a/packfile.c +++ b/packfile.c @@ -735,8 +735,7 @@ static void report_pack_garbage(struct string_list *list) report_helper(list, seen_bits, first, list->nr); } -#define prepare_packed_git_one(r, o, l) prepare_packed_git_one_##r(o, l) -static void prepare_packed_git_one_the_repository(char *objdir, int local) +static void prepare_packed_git_one(struct repository *r, char *objdir, int local) { struct strbuf path = STRBUF_INIT; size_t dirnamelen; @@ -769,7 +768,7 @@ static void prepare_packed_git_one_the_repository(char *objdir, int local) base_len = path.len; if (strip_suffix_mem(path.buf, &base_len, ".idx")) { /* Don't reopen a pack we already have. */ - for (p = the_repository->objects->packed_git; p; + for (p = r->objects->packed_git; p; p = p->next) { size_t len; if (strip_suffix(p->pack_name, ".pack", &len) && @@ -783,7 +782,7 @@ static void prepare_packed_git_one_the_repository(char *objdir, int local) * corresponding .pack file that we can map. */ (p = add_packed_git(path.buf, path.len, local)) != NULL) - install_packed_git(the_repository, p); + install_packed_git(r, p); } if (!report_garbage) |