This is the rebased version on the updated sb/object-store I just sent
out plus the fix for get_object_directory(). The interdiff (after
rebased) looks small and nice
diff --git a/packfile.c b/packfile.c
index e02136bebb..63c89ee31a 100644
--- a/packfile.c
+++ b/packfile.c
@@ -890,7 +890,7 @@ static void prepare_packed_git(struct repository *r)
if (r->objects->packed_git_initialized)
return;
- prepare_packed_git_one(r, get_object_directory(), 1);
+ prepare_packed_git_one(r, r->objects->objectdir, 1);
prepare_alt_odb(r);
for (alt = r->objects->alt_odb_list; alt; alt = alt->next)
prepare_packed_git_one(r, alt->path, 0);
I notice there's still one get_object_directory() left in packfile.c
but that should not cause problems with converted functions. That
could be done in "phase 2".
Nguyễn Thái Ngọc Duy (1):
packfile: keep prepare_packed_git() private
Stefan Beller (11):
packfile: allow prepare_packed_git_mru to handle arbitrary
repositories
packfile: allow rearrange_packed_git to handle arbitrary repositories
packfile: allow install_packed_git to handle arbitrary repositories
packfile: add repository argument to prepare_packed_git_one
packfile: add repository argument to prepare_packed_git
packfile: add repository argument to reprepare_packed_git
packfile: allow prepare_packed_git_one to handle arbitrary
repositories
packfile: allow prepare_packed_git to handle arbitrary repositories
packfile: allow reprepare_packed_git to handle arbitrary repositories
packfile: add repository argument to find_pack_entry
packfile: allow find_pack_entry to handle arbitrary repositories
builtin/count-objects.c | 3 +-
builtin/fsck.c | 2 --
builtin/gc.c | 3 +-
builtin/pack-objects.c | 1 -
builtin/pack-redundant.c | 2 --
builtin/receive-pack.c | 3 +-
bulk-checkin.c | 3 +-
fast-import.c | 3 +-
fetch-pack.c | 3 +-
http-backend.c | 1 -
http.c | 2 +-
pack-bitmap.c | 1 -
packfile.c | 76 +++++++++++++++++++---------------------
packfile.h | 11 +++---
server-info.c | 1 -
sha1_file.c | 8 ++---
sha1_name.c | 2 --
17 files changed, 58 insertions(+), 67 deletions(-)
--
2.17.0.rc0.348.gd5a49e0b6f
