Merge branch 'bw/protocol-v2' into HEAD

diff --git a/repository.h b/repository.h
index f21fd93f722714617f0b6f2419c25d34a90311de..09df94a4722dacc40ab106e3b3ca348167daa764 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -2,9 +2,10 @@
 #define REPOSITORY_H
 
 struct config_set;
+struct git_hash_algo;
 struct index_state;
+struct raw_object_store;
 struct submodule_cache;
-struct git_hash_algo;
 
 struct repository {
        /* Environment */
@@ -21,13 +22,9 @@ struct repository {
        char *commondir;
 
        /*
-        * Path to the repository's object store.
-        * Cannot be NULL after initialization.
+        * Holds any information related to accessing the raw object content.
         */
-       char *objectdir;
-
-       /* Path to extra alternate object database if not NULL */
-       char *alternate_db;
+       struct raw_object_store *objects;
 
        /*
         * Path to the repository's graft file.