Skip to content

Commit f8e75c5

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
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 c5e135a commit f8e75c5

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
@@ -1393,8 +1393,8 @@ int git_config_color(char *dest, const char *var, const char *value)
13931393
return 0;
13941394
}
13951395

1396-
static int git_default_core_config(const char *var, const char *value,
1397-
const struct config_context *ctx, void *cb)
1396+
int git_default_core_config(const char *var, const char *value,
1397+
const struct config_context *ctx, void *cb)
13981398
{
13991399
/* This needs a better name */
14001400
if (!strcmp(var, "core.filemode")) {

config.h

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

168168
int git_default_config(const char *, const char *,
169169
const struct config_context *, void *);
170+
int git_default_core_config(const char *var, const char *value,
171+
const struct config_context *ctx, void *cb);
170172

171173
/**
172174
* Read a specific file in git-config format.

setup.c

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

25952595
safe_create_dir(the_repository, git_dir, 0);
25962596

0 commit comments

Comments
 (0)