[PATCH 41/44] packfile: allow reprepare_packed_git to handle arbitrary repositories

[Nguyễn Thái Ngọc Duy]

From: Stefan Beller <sbel...@google.com>

Signed-off-by: Stefan Beller <sbel...@google.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 packfile.c | 8 ++++----
 packfile.h | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packfile.c b/packfile.c
index 2276e2ad26..fbf5d56754 100644
--- a/packfile.c
+++ b/packfile.c
@@ -897,11 +897,11 @@ void prepare_packed_git(struct repository *r)
        r->objects.packed_git_initialized = 1;
 }
 
-void reprepare_packed_git_the_repository(void)
+void reprepare_packed_git(struct repository *r)
 {
-       the_repository->objects.approximate_object_count_valid = 0;
-       the_repository->objects.packed_git_initialized = 0;
-       prepare_packed_git(the_repository);
+       r->objects.approximate_object_count_valid = 0;
+       r->objects.packed_git_initialized = 0;
+       prepare_packed_git(r);
 }
 
 struct packed_git *get_packed_git(struct repository *r)
diff --git a/packfile.h b/packfile.h
index 3fd9092472..ee6da3a9ae 100644
--- a/packfile.h
+++ b/packfile.h
@@ -35,8 +35,7 @@ extern struct packed_git *parse_pack_index(unsigned char 
*sha1, const char *idx_
 extern void (*report_garbage)(unsigned seen_bits, const char *path);
 
 extern void prepare_packed_git(struct repository *r);
-#define reprepare_packed_git(r) reprepare_packed_git_##r()
-extern void reprepare_packed_git_the_repository(void);
+extern void reprepare_packed_git(struct repository *r);
 extern void install_packed_git(struct repository *r, struct packed_git *pack);
 
 struct packed_git *get_packed_git(struct repository *r);
-- 
2.16.1.435.g8f24da2e1a