From 7875acb6ecf85a7dc29554d193955ce5e265764f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2016 17:36:49 -0500 Subject: wrap shared_repository global in get/set accessors It would be useful to control access to the global shared_repository, so that we can lazily load its config. The first step to doing so is to make sure all access goes through a set of functions. This step is purely mechanical, and should result in no change of behavior. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- environment.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'environment.c') diff --git a/environment.c b/environment.c index 6dec9d0403..b42e238434 100644 --- a/environment.c +++ b/environment.c @@ -29,7 +29,6 @@ int repository_format_version; int repository_format_precious_objects; const char *git_commit_encoding; const char *git_log_output_encoding; -int shared_repository = PERM_UMASK; const char *apply_default_whitespace; const char *apply_default_ignorewhitespace; const char *git_attributes_file; @@ -325,3 +324,15 @@ const char *get_commit_output_encoding(void) { return git_commit_encoding ? git_commit_encoding : "UTF-8"; } + +static int the_shared_repository = PERM_UMASK; + +void set_shared_repository(int value) +{ + the_shared_repository = value; +} + +int get_shared_repository(void) +{ + return the_shared_repository; +} -- cgit v1.2.1 From ae5f67763b2a3eea7e7675febd8f87bf2f4c1219 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2016 17:36:53 -0500 Subject: lazily load core.sharedrepository The "shared_repository" config is loaded as part of check_repository_format_version, but it's not quite like the other values we check there. Something like core.repositoryformatversion only makes sense in per-repo config, but core.sharedrepository can be set in a per-user config (e.g., to make all "git init" invocations shared by default). So it would make more sense as part of git_default_config. Commit 457f06d (Introduce core.sharedrepository, 2005-12-22) says: [...]the config variable is set in the function which checks the repository format. If this were done in git_default_config instead, a lot of programs would need to be modified to call git_config(git_default_config) first. This is still the case today, but we have one extra trick up our sleeve. Now that we have the git_configset infrastructure, it's not so expensive for us to ask for a single value. So we can simply lazy-load it on demand. This should be OK to do in general. There are some problems with loading config before setup_git_directory() is called, but we shouldn't be accessing the value before then (if we were, then it would already be broken, as the variable would not have been set by check_repository_format_version!). The trickiest caller is git-init, but it handles the values manually itself. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- environment.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'environment.c') diff --git a/environment.c b/environment.c index b42e238434..8b8c8e8496 100644 --- a/environment.c +++ b/environment.c @@ -326,13 +326,22 @@ const char *get_commit_output_encoding(void) } static int the_shared_repository = PERM_UMASK; +static int need_shared_repository_from_config = 1; void set_shared_repository(int value) { the_shared_repository = value; + need_shared_repository_from_config = 0; } int get_shared_repository(void) { + if (need_shared_repository_from_config) { + const char *var = "core.sharedrepository"; + const char *value; + if (!git_config_get_value(var, &value)) + the_shared_repository = git_config_perm(var, value); + need_shared_repository_from_config = 0; + } return the_shared_repository; } -- cgit v1.2.1 From c90e5293d11bc2c671312778aea33922a4ee1725 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2016 17:37:18 -0500 Subject: setup: drop repository_format_version global Nobody reads this anymore, and they're not likely to; the interesting thing is whether or not we passed check_repository_format(), and possibly the individual "extension" variables. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- environment.c | 1 - 1 file changed, 1 deletion(-) (limited to 'environment.c') diff --git a/environment.c b/environment.c index 8b8c8e8496..d9e3861fe8 100644 --- a/environment.c +++ b/environment.c @@ -25,7 +25,6 @@ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; int warn_on_object_refname_ambiguity = 1; int ref_paranoia = -1; -int repository_format_version; int repository_format_precious_objects; const char *git_commit_encoding; const char *git_log_output_encoding; -- cgit v1.2.1