[PATCH v2 15/24] init-db: move writing repo version into a function
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Feb 22, 2020, 20:17 UTC
- Message-ID
- <20200222201749.937983-16-sandals@crustytoothpaste.net>
- In-Reply-To
- <20200222201749.937983-1-sandals@crustytoothpaste.net>
When we perform a clone, we won't know the remote side's hash algorithm until we've read the heads. Consequently, we'll need to rewrite the repository format version and hash algorithm once we know what the remote side has. Move the code that does this into its own function so that we can call it from clone in the future.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- builtin/init-db.c | 42 ++++++++++++++++++++++++------------------ cache.h | 1 + 2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index ab4fd682ab..5d96e59885 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -178,6 +178,29 @@ static int needs_work_tree_config(const char *git_dir, const char *work_tree) return 1; } +void initialize_repository_version(int hash_algo) +{ + char repo_version_string[10]; + int repo_version = GIT_REPO_VERSION; + +#ifndef ENABLE_SHA256 + if (hash_algo != GIT_HASH_SHA1) + die(_("The hash algorithm %s is not supported in this build."), hash_algos[hash_algo].name); +#endif + + if (hash_algo != GIT_HASH_SHA1) + repo_version = GIT_REPO_VERSION_READ; + + /* This forces creation of new config file */ + xsnprintf(repo_version_string, sizeof(repo_version_string), + "%d", repo_version); + git_config_set("core.repositoryformatversion", repo_version_string); + + if (hash_algo != GIT_HASH_SHA1) + git_config_set("extensions.objectformat", + hash_algos[hash_algo].name); +} + static int create_default_files(const char *template_path, const char *original_git_dir, const struct repository_format *fmt) @@ -185,12 +208,10 @@ static int create_default_files(const char *template_path, struct stat st1; struct strbuf buf = STRBUF_INIT; char *path; - char repo_version_string[10]; char junk[2]; int reinit; int filemode; struct strbuf err = STRBUF_INIT; - int repo_version = GIT_REPO_VERSION; /* Just look for `init.templatedir` */ init_db_template_dir = NULL; /* re-set in case it was set before */ @@ -248,22 +269,7 @@ static int create_default_files(const char *template_path, exit(1); } -#ifndef ENABLE_SHA256 - if (fmt->hash_algo != GIT_HASH_SHA1) - die(_("The hash algorithm %s is not supported in this build."), hash_algos[fmt->hash_algo].name); -#endif - - if (fmt->hash_algo != GIT_HASH_SHA1) - repo_version = GIT_REPO_VERSION_READ; - - /* This forces creation of new config file */ - xsnprintf(repo_version_string, sizeof(repo_version_string), - "%d", repo_version); - git_config_set("core.repositoryformatversion", repo_version_string); - - if (fmt->hash_algo != GIT_HASH_SHA1) - git_config_set("extensions.objectformat", - hash_algos[fmt->hash_algo].name); + initialize_repository_version(fmt->hash_algo); /* Check filemode trustability */ path = git_path_buf(&buf, "config"); diff --git a/cache.h b/cache.h index 7a47e023ba..0653318d2b 100644 --- a/cache.h +++ b/cache.h @@ -629,6 +629,7 @@ int path_inside_repo(const char *prefix, const char *path); int init_db(const char *git_dir, const char *real_git_dir, const char *template_dir, int hash_algo, unsigned int flags); +void initialize_repository_version(int hash_algo); void sanitize_stdfds(void); int daemonize(void);