diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2017-08-30 00:11:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-07 08:49:46 +0900 |
| commit | ad6b8b33e6ddca693cf7551f80656d9e058ff3ec (patch) | |
| tree | 71d50897adaf3bb8ca04bf0a582ba1d6d0e57c44 | |
| parent | e65fa5a2ca8f861b46889eaacf3deed445882af1 (diff) | |
| download | git-ad6b8b33e6ddca693cf7551f80656d9e058ff3ec.tar.gz | |
pack: allow install_packed_git to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | packfile.c | 6 | ||||
| -rw-r--r-- | packfile.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packfile.c b/packfile.c index 86c3964018..51af035965 100644 --- a/packfile.c +++ b/packfile.c @@ -664,13 +664,13 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local) return p; } -void install_packed_git_the_repository(struct packed_git *pack) +void install_packed_git(struct repository *r, struct packed_git *pack) { if (pack->pack_fd != -1) pack_open_fds++; - pack->next = the_repository->objects.packed_git; - the_repository->objects.packed_git = pack; + pack->next = r->objects.packed_git; + r->objects.packed_git = pack; } void (*report_garbage)(unsigned seen_bits, const char *path); diff --git a/packfile.h b/packfile.h index 74f293c439..ba6f08be99 100644 --- a/packfile.h +++ b/packfile.h @@ -36,8 +36,7 @@ extern void (*report_garbage)(unsigned seen_bits, const char *path); extern void prepare_packed_git_the_repository(void); #define reprepare_packed_git(r) reprepare_packed_git_##r() extern void reprepare_packed_git_the_repository(void); -#define install_packed_git(r, p) install_packed_git_##r(p) -extern void install_packed_git_the_repository(struct packed_git *pack); +extern void install_packed_git(struct repository *r, struct packed_git *pack); /* * Give a rough count of objects in the repository. This sacrifices accuracy |