Skip to content

Commit cb464e1

Browse files
committed
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 f675455 commit cb464e1

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
@@ -410,7 +410,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
410410
startup_info->have_repository = 1;
411411

412412
/* Ensure `core.hidedotfiles` is processed */
413-
git_config(platform_core_config, NULL);
413+
git_config(git_default_core_config, NULL);
414414

415415
safe_create_dir(git_dir, 0);
416416

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ int git_config_color(char *dest, const char *var, const char *value)
14741474
return 0;
14751475
}
14761476

1477-
static int git_default_core_config(const char *var, const char *value, void *cb)
1477+
int git_default_core_config(const char *var, const char *value, void *cb)
14781478
{
14791479
/* This needs a better name */
14801480
if (!strcmp(var, "core.filemode")) {

config.h

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

133133
int git_default_config(const char *, const char *, void *);
134+
int git_default_core_config(const char *var, const char *value, void *cb);
134135

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

0 commit comments

Comments
 (0)