Skip to content

Commit 7449054

Browse files
dschomjcheetham
authored andcommitted
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
2 parents 20ac87a + e791129 commit 7449054

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)