[PATCH v2 7/9] read_early_config(): avoid .git/config hack when unneeded
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 3, 2017, 02:04 UTC
- Message-ID
- <db619060d18df21f3259653a52cd79f704b34566.1488506615.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1488506615.git.johannes.schindelin@gmx.de>
So far, we only look whether the startup_info claims to have seen a git_dir.
However, do_git_config_sequence() (and consequently the git_config_with_options() call used by read_early_config() asks the have_git_dir() function whether we have a .git/ directory, which in turn also looks at git_dir and at the environment variable GIT_DIR. And when this is the case, the repository config is handled already, so we do not have to do that again explicitly.
Let's just use the same function, have_git_dir(), to determine whether we have to handle .git/config explicitly.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/config.c b/config.c index 980fcc6ff2e..3ee5e5a15d6 100644 --- a/config.c +++ b/config.c @@ -1434,8 +1434,7 @@ void read_early_config(config_fn_t cb, void *data) * valid repository), and would rarely make things worse (i.e., you do * not generally have a .git/config file sitting around). */ - if (!startup_info->creating_repository && - !startup_info->have_repository) { + if (!startup_info->creating_repository && !have_git_dir()) { struct git_config_source repo_config; memset(&repo_config, 0, sizeof(repo_config));
-- 2.12.0.windows.1.3.g8a117c48243