setup: unset ref storage when reinitializing repository version

When reinitializing a repository's version we may end up unsetting the
hash algorithm when it matches the default hash algorithm. If we didn't
do that then the previously configured value might remain intact.

While the same issue exists for the ref storage extension, we don't do
this here. This has been fine for most of the part because it is not
supported to re-initialize a repository with a different ref storage
format anyway. We're about to introduce a new command to migrate ref
storages though, so this is about to become an issue there.

Prepare for this and unset the ref storage format when reinitializing a
repository with the "files" format.

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 7975230ffbca2c4f4b26ebf464eac6f0408e3739..8c84ec9d4b157ccf6afdff9e402581dc6d057f89 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -2028,6 +2028,8 @@ void initialize_repository_version(int hash_algo,
        if (ref_storage_format != REF_STORAGE_FORMAT_FILES)
                git_config_set("extensions.refstorage",
                               ref_storage_format_to_name(ref_storage_format));
+       else if (reinit)
+               git_config_set_gently("extensions.refstorage", NULL);
 }
 
 static int is_reinit(void)