From: Jonathan Nieder <jrnie...@gmail.com>
Add a repository argument to allow the prepare_packed_git_one caller
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Stefan Beller <sbel...@google.com>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
packfile.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/packfile.c b/packfile.c
index 0f63ec79c8..58473660cd 100644
--- a/packfile.c
+++ b/packfile.c
@@ -726,7 +726,8 @@ static void report_pack_garbage(struct string_list *list)
report_helper(list, seen_bits, first, list->nr);
}
-static void prepare_packed_git_one(char *objdir, int local)
+#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)
{
struct strbuf path = STRBUF_INIT;
size_t dirnamelen;
@@ -878,10 +879,10 @@ void prepare_packed_git(void)
if (the_repository->objects.packed_git_initialized)
return;
- prepare_packed_git_one(get_object_directory(), 1);
+ prepare_packed_git_one(the_repository, get_object_directory(), 1);
prepare_alt_odb(the_repository);
for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next)
- prepare_packed_git_one(alt->path, 0);
+ prepare_packed_git_one(the_repository, alt->path, 0);
rearrange_packed_git();
prepare_packed_git_mru();
the_repository->objects.packed_git_initialized = 1;
--
2.15.1.433.g936d1b9894.dirty
