mirror of
https://github.com/git/git.git
synced 2026-01-11 13:23:12 +09:00
init: do parse _all_ core.* settings early
In Git for Windows, `has_symlinks` is set to 0 by default. Therefore, we need to parse the config setting `core.symlinks` to know if it has been set to `true`. In `git init`, we must do that before copying the templates because they might contain symbolic links. Even if the support for symbolic links on Windows has not made it to upstream Git yet, we really should make sure that all the `core.*` settings are parsed before proceeding, as they might very well change the behavior of `git init` in a way the user intended. This fixes https://github.com/git-for-windows/git/issues/3414 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f0af8b4aae
commit
7997e36561
@ -324,8 +324,8 @@ next_name:
|
||||
return (current & ~negative) | positive;
|
||||
}
|
||||
|
||||
static int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb)
|
||||
int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb)
|
||||
{
|
||||
/* This needs a better name */
|
||||
if (!strcmp(var, "core.filemode")) {
|
||||
|
||||
@ -106,6 +106,8 @@ const char *strip_namespace(const char *namespaced_ref);
|
||||
|
||||
int git_default_config(const char *, const char *,
|
||||
const struct config_context *, void *);
|
||||
int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb);
|
||||
|
||||
/*
|
||||
* TODO: All the below state either explicitly or implicitly relies on
|
||||
|
||||
2
setup.c
2
setup.c
@ -2693,7 +2693,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
* have set up the repository format such that we can evaluate
|
||||
* includeIf conditions correctly in the case of re-initialization.
|
||||
*/
|
||||
repo_config(the_repository, platform_core_config, NULL);
|
||||
repo_config(the_repository, git_default_core_config, NULL);
|
||||
|
||||
safe_create_dir(the_repository, git_dir, 0);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user