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

init: respect core.symlinks before copying the templates
git-for-windows · Nov 25, 2024 · c869af2 · c869af2
2 parents 28a33ca + 863accc
commit c869af2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/config.c b/config.c
@@ -1391,8 +1391,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")) {

diff --git a/config.h b/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.

diff --git a/setup.c b/setup.c
@@ -2564,7 +2564,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(git_dir, 0);