setup: merge configuration of repository formats

The configuration of repository formats is split up across two functions
`validate_hash_algorithm()` and `validate_ref_storage_format()`. This is
fine as-is, but we are about to extend the logic to also read default
values from the config. With the logic split across two functions, we
would either have to pass in additional parameters read from the config,
or read the config multiple times. Both of these options feel a bit
unwieldy.

Merge the code into a new function `repository_format_configure()` that
is responsible for configuring the whole repository's format. Like this,
we can easily read the config in a single place, only.

Furthermore, move the calls to `repo_set_ref_storage_format()` and
`repo_set_hash_algo()` into this new function as well, such that all the
logic to configure the repository format is self-contained here.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index d458edcc028ef17d5917470bdbc71ecbbd66045c..5dfcdc99dd8e1b7d02905f4156f6869535448f53 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -2284,14 +2284,17 @@ static void separate_git_dir(const char *git_dir, const char *git_link)
        write_file(git_link, "gitdir: %s", git_dir);
 }
 
-static void validate_hash_algorithm(struct repository_format *repo_fmt, int hash)
+static void repository_format_configure(struct repository_format *repo_fmt,
+                                       int hash, enum ref_storage_format ref_format)
 {
-       const char *env = getenv(GIT_DEFAULT_HASH_ENVIRONMENT);
+       const char *env;
+
        /*
         * If we already have an initialized repo, don't allow the user to
         * specify a different algorithm, as that could cause corruption.
         * Otherwise, if the user has specified one on the command line, use it.
         */
+       env = getenv(GIT_DEFAULT_HASH_ENVIRONMENT);
        if (repo_fmt->version >= 0 && hash != GIT_HASH_UNKNOWN && hash != repo_fmt->hash_algo)
                die(_("attempt to reinitialize repository with different hash"));
        else if (hash != GIT_HASH_UNKNOWN)
@@ -2302,25 +2305,22 @@ static void validate_hash_algorithm(struct repository_format *repo_fmt, int hash
                        die(_("unknown hash algorithm '%s'"), env);
                repo_fmt->hash_algo = env_algo;
        }
-}
-
-static void validate_ref_storage_format(struct repository_format *repo_fmt,
-                                       enum ref_storage_format format)
-{
-       const char *name = getenv("GIT_DEFAULT_REF_FORMAT");
+       repo_set_hash_algo(the_repository, repo_fmt->hash_algo);
 
+       env = getenv("GIT_DEFAULT_REF_FORMAT");
        if (repo_fmt->version >= 0 &&
-           format != REF_STORAGE_FORMAT_UNKNOWN &&
-           format != repo_fmt->ref_storage_format) {
+           ref_format != REF_STORAGE_FORMAT_UNKNOWN &&
+           ref_format != repo_fmt->ref_storage_format) {
                die(_("attempt to reinitialize repository with different reference storage format"));
-       } else if (format != REF_STORAGE_FORMAT_UNKNOWN) {
-               repo_fmt->ref_storage_format = format;
-       } else if (name) {
-               format = ref_storage_format_by_name(name);
-               if (format == REF_STORAGE_FORMAT_UNKNOWN)
-                       die(_("unknown ref storage format '%s'"), name);
-               repo_fmt->ref_storage_format = format;
+       } else if (ref_format != REF_STORAGE_FORMAT_UNKNOWN) {
+               repo_fmt->ref_storage_format = ref_format;
+       } else if (env) {
+               ref_format = ref_storage_format_by_name(env);
+               if (ref_format == REF_STORAGE_FORMAT_UNKNOWN)
+                       die(_("unknown ref storage format '%s'"), env);
+               repo_fmt->ref_storage_format = ref_format;
        }
+       repo_set_ref_storage_format(the_repository, repo_fmt->ref_storage_format);
 }
 
 int init_db(const char *git_dir, const char *real_git_dir,
@@ -2353,22 +2353,15 @@ int init_db(const char *git_dir, const char *real_git_dir,
        }
        startup_info->have_repository = 1;
 
-       /* Check to see if the repository version is right.
+       /*
+        * Check to see if the repository version is right.
         * Note that a newly created repository does not have
         * config file, so this will not fail.  What we are catching
         * is an attempt to reinitialize new repository with an old tool.
         */
        check_repository_format(&repo_fmt);
 
-       validate_hash_algorithm(&repo_fmt, hash);
-       validate_ref_storage_format(&repo_fmt, ref_storage_format);
-
-       /*
-        * Now that we have set up both the hash algorithm and the ref storage
-        * format we can update the repository's settings accordingly.
-        */
-       repo_set_hash_algo(the_repository, repo_fmt.hash_algo);
-       repo_set_ref_storage_format(the_repository, repo_fmt.ref_storage_format);
+       repository_format_configure(&repo_fmt, hash, ref_storage_format);
 
        /*
         * Ensure `core.hidedotfiles` is processed. This must happen after we