aboutsummaryrefslogtreecommitdiffstats
path: root/repo-settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'repo-settings.c')
-rw-r--r--repo-settings.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/repo-settings.c b/repo-settings.c
index 9d16d5399e..719cd7c85c 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -21,7 +21,6 @@ static void repo_cfg_int(struct repository *r, const char *key, int *dest,
void prepare_repo_settings(struct repository *r)
{
- const struct repo_settings defaults = REPO_SETTINGS_INIT;
int experimental;
int value;
const char *strval;
@@ -35,7 +34,7 @@ void prepare_repo_settings(struct repository *r)
if (r->settings.initialized)
return;
- memcpy(&r->settings, &defaults, sizeof(defaults));
+ repo_settings_clear(r);
r->settings.initialized++;
/* Booleans config or default, cascades to other settings */
@@ -143,6 +142,13 @@ void prepare_repo_settings(struct repository *r)
r->settings.packed_git_limit = ulongval;
}
+void repo_settings_clear(struct repository *r)
+{
+ struct repo_settings empty = REPO_SETTINGS_INIT;
+ FREE_AND_NULL(r->settings.fsmonitor);
+ r->settings = empty;
+}
+
enum log_refs_config repo_settings_get_log_all_ref_updates(struct repository *repo)
{
const char *value;