diff options
authorNguyễn Thái Ngọc Duy <>2018-03-03 11:35:54 (GMT)
committerJunio C Hamano <>2018-03-05 19:14:03 (GMT)
commitb2f0eceecf266e60fa95970e0973a8f23f911fb1 (patch)
parentb2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e (diff)
repository: initialize the_repository in main()
This simplifies initialization of struct repository and anything inside. Easier to read. Easier to add/remove fields. Everything will go through main() common-main.c so this should cover all programs, including t/helper. Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
3 files changed, 16 insertions, 6 deletions
diff --git a/common-main.c b/common-main.c
index 6a68900..7d716d5 100644
--- a/common-main.c
+++ b/common-main.c
@@ -34,6 +34,8 @@ int main(int argc, const char **argv)
+ initialize_the_repository();
diff --git a/repository.c b/repository.c
index 4ffbe9b..0eddf28 100644
--- a/repository.c
+++ b/repository.c
@@ -4,10 +4,16 @@
#include "submodule-config.h"
/* The main repository */
-static struct repository the_repo = {
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &the_index, &hash_algos[GIT_HASH_SHA1], 0, 0
-struct repository *the_repository = &the_repo;
+static struct repository the_repo;
+struct repository *the_repository;
+void initialize_the_repository(void)
+ the_repository = &the_repo;
+ the_repo.index = &the_index;
+ repo_set_hash_algo(&the_repo, GIT_HASH_SHA1);
static char *git_path_from_env(const char *envvar, const char *git_dir,
const char *path, int fromenv)
@@ -128,7 +134,9 @@ static int read_and_verify_repository_format(struct repository_format *format,
* Initialize 'repo' based on the provided 'gitdir'.
* Return 0 upon success and a non-zero value upon failure.
-int repo_init(struct repository *repo, const char *gitdir, const char *worktree)
+static int repo_init(struct repository *repo,
+ const char *gitdir,
+ const char *worktree)
struct repository_format format;
memset(repo, 0, sizeof(*repo));
diff --git a/repository.h b/repository.h
index 0329e40..40c1c81 100644
--- a/repository.h
+++ b/repository.h
@@ -91,7 +91,7 @@ extern struct repository *the_repository;
extern void repo_set_gitdir(struct repository *repo, const char *path);
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);