sha1_file.c: move delayed getenv(altdb) back to setup_git_env()

diff --git a/repository.h b/repository.h
index 0329e40c7f5e72dad3ba46328a8e3d6c29ed8e58..2bfbf762f398f81c6116b1aa18a459f9178aa727 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -26,6 +26,9 @@ struct repository {
         */
        char *objectdir;
 
+       /* Path to extra alternate object database if not NULL */
+       char *alternate_db;
+
        /*
         * Path to the repository's graft file.
         * Cannot be NULL after initialization.
@@ -88,10 +91,20 @@ struct repository {
 
 extern struct repository *the_repository;
 
-extern void repo_set_gitdir(struct repository *repo, const char *path);
+struct set_gitdir_args {
+       const char *commondir;
+       const char *object_dir;
+       const char *graft_file;
+       const char *index_file;
+       const char *alternate_db;
+};
+
+extern void repo_set_gitdir(struct repository *repo,
+                           const char *root,
+                           const struct set_gitdir_args *optional);
 extern void repo_set_worktree(struct repository *repo, const char *path);
 extern void repo_set_hash_algo(struct repository *repo, int algo);
-extern int repo_init(struct repository *repo, const char *gitdir, const char *worktree);
+extern void initialize_the_repository(void);
 extern int repo_submodule_init(struct repository *submodule,
                               struct repository *superproject,
                               const char *path);