Skip to content

Commit

Permalink
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
Browse files Browse the repository at this point in the history
init: respect core.symlinks before copying the templates
  • Loading branch information
dscho committed Oct 13, 2021
2 parents 42f3463 + 0efd86d commit 0055932
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
struct transport_ls_refs_options transport_ls_refs_options =
TRANSPORT_LS_REFS_OPTIONS_INIT;

git_config(platform_core_config, NULL);
git_config(git_default_core_config, NULL);

packet_trace_identity("clone");

Expand Down
2 changes: 1 addition & 1 deletion builtin/column.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(platform_core_config, NULL);
git_config(git_default_core_config, NULL);

/* This one is special and must be the first one */
if (argc > 1 && starts_with(argv[1], "--command=")) {
Expand Down
2 changes: 1 addition & 1 deletion builtin/init-db.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion config.c
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,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")) {
Expand Down
1 change: 1 addition & 0 deletions config.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,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.
Expand Down

0 comments on commit 0055932

Please sign in to comment.