[PATCH 02/13] init: split out template population from create_default_files()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 12, 2021, 20:13 UTC
- Message-ID
- <patch-02.13-ef2b67768cf-20211212T201308Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.13-00000000000-20211212T201308Z-avarab@gmail.com>
The create_default_files() function only has one caller, init_db(). Let's have it call a separate create_template_files() function.
This refactoring changes nothing about how the repository is initialized, but makes subsequent changes to create_template_files() easier to read, e.g. because new variables we'll need will be scoped to that function.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/init-db.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index 2167796ff2a..3cf834eddd2 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -187,21 +187,9 @@ void initialize_repository_version(int hash_algo, int reinit) git_config_set_gently("extensions.objectformat", NULL); } -static int create_default_files(const char *template_path, - const char *original_git_dir, - const char *initial_branch, - const struct repository_format *fmt, - int quiet) +static void create_template_files(const char *template_path) { - struct stat st1; - struct strbuf buf = STRBUF_INIT; - char *path; - char junk[2]; - int reinit; - int filemode; - struct strbuf err = STRBUF_INIT; const char *init_template_dir = NULL; - const char *work_tree = get_git_work_tree(); /* * First copy the templates -- we might have the default @@ -218,6 +206,21 @@ static int create_default_files(const char *template_path, git_config_clear(); reset_shared_repository(); git_config(git_default_config, NULL); +} + +static int create_default_files(const char *original_git_dir, + const char *initial_branch, + const struct repository_format *fmt, + int quiet) +{ + struct stat st1; + struct strbuf buf = STRBUF_INIT; + char *path; + char junk[2]; + int reinit; + int filemode; + struct strbuf err = STRBUF_INIT; + const char *work_tree = get_git_work_tree(); /* * We must make sure command-line options continue to override any @@ -425,7 +428,8 @@ int init_db(const char *git_dir, const char *real_git_dir, validate_hash_algorithm(&repo_fmt, hash); - reinit = create_default_files(template_dir, original_git_dir, + create_template_files(template_dir); + reinit = create_default_files(original_git_dir, initial_branch, &repo_fmt, flags & INIT_DB_QUIET); if (reinit && initial_branch)
-- 2.34.1.1020.gb1392dd1877