mirror of
https://github.com/git-for-windows/git.git
synced 2026-02-04 12:24:55 -06:00
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
This commit is contained in:
commit
65e1f7a677
4
config.c
4
config.c
@ -1393,8 +1393,8 @@ int git_config_color(char *dest, const char *var, const char *value)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb)
|
||||
int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb)
|
||||
{
|
||||
/* This needs a better name */
|
||||
if (!strcmp(var, "core.filemode")) {
|
||||
|
||||
2
config.h
2
config.h
@ -167,6 +167,8 @@ typedef int (*config_fn_t)(const char *, const char *,
|
||||
|
||||
int git_default_config(const char *, const char *,
|
||||
const struct config_context *, void *);
|
||||
int git_default_core_config(const char *var, const char *value,
|
||||
const struct config_context *ctx, void *cb);
|
||||
|
||||
/**
|
||||
* Read a specific file in git-config format.
|
||||
|
||||
2
setup.c
2
setup.c
@ -2590,7 +2590,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
* have set up the repository format such that we can evaluate
|
||||
* includeIf conditions correctly in the case of re-initialization.
|
||||
*/
|
||||
git_config(platform_core_config, NULL);
|
||||
git_config(git_default_core_config, NULL);
|
||||
|
||||
safe_create_dir(the_repository, git_dir, 0);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user