Merge branch 'sb/object-store' into next

diff --git a/http-backend.c b/http-backend.c
index 5d241e9109f5f860ed9d4ec9f4ea0efedd422b22..43c49fcce615772ea30eac397510a0134ce440c4 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "repository.h"
 #include "refs.h"
 #include "pkt-line.h"
 #include "object.h"
@@ -10,6 +11,7 @@
 #include "url.h"
 #include "argv-array.h"
 #include "packfile.h"
+#include "object-store.h"
 #include "protocol.h"
 
 static const char content_type[] = "Content-Type";
@@ -522,13 +524,13 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
 
        select_getanyfile(hdr);
        prepare_packed_git();
-       for (p = packed_git; p; p = p->next) {
+       for (p = get_packed_git(the_repository); p; p = p->next) {
                if (p->pack_local)
                        cnt++;
        }
 
        strbuf_grow(&buf, cnt * 53 + 2);
-       for (p = packed_git; p; p = p->next) {
+       for (p = get_packed_git(the_repository); p; p = p->next) {
                if (p->pack_local)
                        strbuf_addf(&buf, "P %s\n", p->pack_name + objdirlen + 6);
        }