Merge pull request #3417 from dscho/initialize-core.symlinks-earlier

init: respect core.symlinks before copying the templates
git-for-windows · Oct 14, 2021 · f1599e6 · f1599e6
2 parents 5346087 + ca49663
commit f1599e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/builtin/init-db.c b/builtin/init-db.c
@@ -410,7 +410,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
 	startup_info->have_repository = 1;
 
 	/* Ensure `core.hidedotfiles` is processed */
-	git_config(platform_core_config, NULL);
+	git_config(git_default_core_config, NULL);
 
 	safe_create_dir(git_dir, 0);
 

diff --git a/config.c b/config.c
@@ -1276,7 +1276,7 @@ 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, void *cb)
+int git_default_core_config(const char *var, const char *value, void *cb)
 {
 	/* This needs a better name */
 	if (!strcmp(var, "core.filemode")) {

diff --git a/config.h b/config.h
@@ -122,6 +122,7 @@ struct config_options {
 typedef int (*config_fn_t)(const char *, const char *, void *);
 
 int git_default_config(const char *, const char *, void *);
+int git_default_core_config(const char *var, const char *value, void *cb);
 
 /**
  * Read a specific file in git-config format.