Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init: respect core.symlinks before copying the templates #3417

Merged
merged 2 commits into from
Oct 13, 2021
Merged

init: respect core.symlinks before copying the templates #3417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad3d10
init: do parse _all_ core.* settings early
dscho Sep 8, 2021
0efd86d
fixup! mingw: ensure that core.longPaths is handled *always*
dscho Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtin/clone.c
View file
Open in desktop
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);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see this is a fixup!, but depends on the previous commit. I assume you'll remember to reorder the commits in the next rebase?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. The individual commit needs to go to the Git mailing list early, I think. Or maybe we should combine it with contributing the symlink support (but that's a bigger task as those patches are entangled with the longPaths and the FSCache topics).


packet_trace_identity("clone");

Expand Down
2 changes: 1 addition & 1 deletion builtin/column.c
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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