Skip to content

Commit 4cafe5b

Browse files
dschomjcheetham
authored andcommitted
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 #3414 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 69cd08b commit 4cafe5b

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

builtin/init-db.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
418418
startup_info->have_repository = 1;
419419

420420
/* Ensure `core.hidedotfiles` is processed */
421-
git_config(platform_core_config, NULL);
421+
git_config(git_default_core_config, NULL);
422422

423423
safe_create_dir(git_dir, 0);
424424

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ int git_config_color(char *dest, const char *var, const char *value)
15601560
return 0;
15611561
}
15621562

1563-
static int git_default_core_config(const char *var, const char *value, void *cb)
1563+
int git_default_core_config(const char *var, const char *value, void *cb)
15641564
{
15651565
/* This needs a better name */
15661566
if (!strcmp(var, "core.filemode")) {

config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ struct config_options {
132132
typedef int (*config_fn_t)(const char *, const char *, void *);
133133

134134
int git_default_config(const char *, const char *, void *);
135+
int git_default_core_config(const char *var, const char *value, void *cb);
135136

136137
/**
137138
* Read a specific file in git-config format.

0 commit comments

Comments
 (0)