From: Jonathan Nieder <jrnieder@xxxxxxxxx>
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
packfile.c | 8 ++++----
packfile.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/packfile.c b/packfile.c
index 7dc7e8e383..7aa69dd3c0 100644
--- a/packfile.c
+++ b/packfile.c
@@ -887,11 +887,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);
}
unsigned long unpack_object_header_buffer(const unsigned char *buf,
diff --git a/packfile.h b/packfile.h
index 75be3cb877..b3138816e7 100644
--- a/packfile.h
+++ b/packfile.h
@@ -33,8 +33,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);
/*
--
2.15.1.433.g936d1b9894.dirty
