Skip to content

Commit f586407

Browse files
dschoGit for Windows Build Agent
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 52eadfb commit f586407

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

config.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,8 +1390,8 @@ int git_config_color(char *dest, const char *var, const char *value)
13901390
return 0;
13911391
}
13921392

1393-
static int git_default_core_config(const char *var, const char *value,
1394-
const struct config_context *ctx, void *cb)
1393+
int git_default_core_config(const char *var, const char *value,
1394+
const struct config_context *ctx, void *cb)
13951395
{
13961396
/* This needs a better name */
13971397
if (!strcmp(var, "core.filemode")) {

config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ typedef int (*config_fn_t)(const char *, const char *,
165165

166166
int git_default_config(const char *, const char *,
167167
const struct config_context *, void *);
168+
int git_default_core_config(const char *var, const char *value,
169+
const struct config_context *ctx, void *cb);
168170

169171
/**
170172
* Read a specific file in git-config format.

setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2610,7 +2610,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
26102610
* have set up the repository format such that we can evaluate
26112611
* includeIf conditions correctly in the case of re-initialization.
26122612
*/
2613-
git_config(platform_core_config, NULL);
2613+
git_config(git_default_core_config, NULL);
26142614

26152615
safe_create_dir(the_repository, git_dir, 0);
26162616

0 commit comments

Comments
 (0)