Skip to content

Commit 36cb847

Browse files
committed
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
2 parents 237524e + d0dd307 commit 36cb847

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

builtin/init-db.c

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ int git_config_color(char *dest, const char *var, const char *value)
12761276
return 0;
12771277
}
12781278

1279-
static int git_default_core_config(const char *var, const char *value, void *cb)
1279+
int git_default_core_config(const char *var, const char *value, void *cb)
12801280
{
12811281
/* This needs a better name */
12821282
if (!strcmp(var, "core.filemode")) {

config.h

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ struct config_options {
122122
typedef int (*config_fn_t)(const char *, const char *, void *);
123123

124124
int git_default_config(const char *, const char *, void *);
125+
int git_default_core_config(const char *var, const char *value, void *cb);
125126

126127
/**
127128
* Read a specific file in git-config format.

0 commit comments

Comments
 (0)