From: Jonathan Nieder <jrnieder@xxxxxxxxx>
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
packfile.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/packfile.c b/packfile.c
index fd7dfc816e..2b73e62a44 100644
--- a/packfile.c
+++ b/packfile.c
@@ -726,8 +726,8 @@ 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;
@@ -760,8 +760,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;
- p = p->next) {
+ for (p = r->objects.packed_git; p; p = p->next) {
size_t len;
if (strip_suffix(p->pack_name, ".pack", &len) &&
len == base_len &&
@@ -774,7 +773,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)
--
2.15.1.433.g936d1b9894.dirty
