environment: move access to "core.hooksPath" into repo settings
The "core.hooksPath" setting is stored in a global variable and populated via the `git_default_core_config`. This may cause issues in the case where one is handling multiple different repositories in a single process with different values for that config key, as we may or may not see the correct value in that case. Furthermore, global state blocks our path towards libification. Refactor the code so that we instead store the value in `struct repo_settings`. The value is computed as-needed and cached. The result should be functionally the same as there aren't ever any code paths where we'd execute hooks outside the context of a repository. Note that this requires us to change the passed-in repository in the `repo_git_path()` family of functions to be non-constant, as we call `adjust_git_path()` there. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
b411ed60c7
commit
6f3fbed8ed
@ -146,6 +146,7 @@ void repo_settings_clear(struct repository *r)
|
||||
{
|
||||
struct repo_settings empty = REPO_SETTINGS_INIT;
|
||||
FREE_AND_NULL(r->settings.fsmonitor);
|
||||
FREE_AND_NULL(r->settings.hooks_path);
|
||||
r->settings = empty;
|
||||
}
|
||||
|
||||
@ -173,3 +174,10 @@ int repo_settings_get_warn_ambiguous_refs(struct repository *repo)
|
||||
&repo->settings.warn_ambiguous_refs, 1);
|
||||
return repo->settings.warn_ambiguous_refs;
|
||||
}
|
||||
|
||||
const char *repo_settings_get_hooks_path(struct repository *repo)
|
||||
{
|
||||
if (!repo->settings.hooks_path)
|
||||
repo_config_get_pathname(repo, "core.hookspath", &repo->settings.hooks_path);
|
||||
return repo->settings.hooks_path;
|
||||
}
|
||||
|
Reference in New Issue
Block a user