diff --git a/compat/mingw.c b/compat/mingw.c index f572bad46a..52ad1d2599 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -243,7 +243,7 @@ static char *unset_environment_variables; int core_fscache; int core_long_paths; -int mingw_core_config(const char *var, const char *value) +int mingw_core_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "core.hidedotfiles")) { if (value && !strcasecmp(value, "dotgitonly")) diff --git a/compat/mingw.h b/compat/mingw.h index 677f35fe4f..6c80ec98cd 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -14,7 +14,7 @@ typedef _sigset_t sigset_t; extern int core_fscache; extern int core_long_paths; -extern int mingw_core_config(const char *var, const char *value); +extern int mingw_core_config(const char *var, const char *value, void *cb); #define platform_core_config mingw_core_config /* diff --git a/config.c b/config.c index e296c97f68..d22732865a 100644 --- a/config.c +++ b/config.c @@ -991,7 +991,7 @@ int git_config_pathname(const char **dest, const char *var, const char *value) return 0; } -static int git_default_core_config(const char *var, const char *value) +static int git_default_core_config(const char *var, const char *value, void *cb) { /* This needs a better name */ if (!strcmp(var, "core.filemode")) { @@ -1235,7 +1235,7 @@ static int git_default_core_config(const char *var, const char *value) } /* Add other config variables here and to Documentation/config.txt. */ - return platform_core_config(var, value); + return platform_core_config(var, value, cb); } static int git_default_i18n_config(const char *var, const char *value) @@ -1323,7 +1323,7 @@ static int git_default_mailmap_config(const char *var, const char *value) int git_default_config(const char *var, const char *value, void *cb) { if (starts_with(var, "core.")) - return git_default_core_config(var, value); + return git_default_core_config(var, value, cb); if (starts_with(var, "user.")) return git_ident_config(var, value, cb); diff --git a/git-compat-util.h b/git-compat-util.h index a31207c4dc..17e1807f7e 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -394,7 +394,7 @@ typedef uintmax_t timestamp_t; #endif #ifndef platform_core_config -static inline int noop_core_config(const char *var, const char *value) +static inline int noop_core_config(const char *var, const char *value, void *cb) { return 0; }