[PATCH v4 13/13] repository: stop setting SHA1 as the default object hash
- From
Patrick Steinhardt <ps@pks.im>
- Date
- May 7, 2024, 04:53 UTC
- Message-ID
- <950b08bc78a76a6f627698372306e2eccc0f3c39.1715057362.git.ps@pks.im>
- In-Reply-To
- <cover.1715057362.git.ps@pks.im>
During the startup of Git, we call `initialize_the_repository()` to set up `the_repository` as well as `the_index`. Part of this setup is also to set the default object hash of the repository to SHA1. This has the effect that `the_hash_algo` is getting initialized to SHA1, as well. This default hash algorithm eventually gets overridden by most Git commands via `setup_git_directory()`, which also detects the actual hash algorithm used by the repository.
There are some commands though that don't access a repository at all, or at a later point only, and thus retain the default hash function for some amount of time. As some of the the preceding commits demonstrate, this can lead to subtle issues when we access `the_hash_algo` when no repository has been set up.
Address this issue by dropping the set up of the default hash algorithm completely. The effect of this is that `the_hash_algo` will map to a `NULL` pointer and thus cause Git to crash when something tries to access the hash algorithm without it being properly initialized. It thus forces all Git commands to explicitly set up the hash algorithm in case there is no repository.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- repository.c | 20 -------------------- 1 file changed, 20 deletions(-)
diff --git a/repository.c b/repository.c index 2118f563e3..15c10015b0 100644 --- a/repository.c +++ b/repository.c @@ -25,28 +25,8 @@ void initialize_repository(struct repository *repo) repo->remote_state = remote_state_new(); repo->parsed_objects = parsed_object_pool_new(); ALLOC_ARRAY(repo->index, 1); index_state_init(repo->index, repo); - - /* - * Unfortunately, we need to keep this hack around for the time being: - * - * - Not setting up the hash algorithm for `the_repository` leads to - * crashes because `the_hash_algo` is a macro that expands to - * `the_repository->hash_algo`. So if Git commands try to access - * `the_hash_algo` without a Git directory we crash. - * - * - Setting up the hash algorithm to be SHA1 by default breaks other - * commands when running with SHA256. - * - * This is another point in case why having global state is a bad idea. - * Eventually, we should remove this hack and stop setting the hash - * algorithm in this function altogether. Instead, it should only ever - * be set via our repository setup procedures. But that requires more - * work. - */ - if (repo == the_repository) - repo_set_hash_algo(repo, GIT_HASH_SHA1); } static void expand_base_dir(char **out, const char *in, const char *base_dir, const char *def_in)
-- 2.45.0