undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: allow for platform-specific core.* config settings

Browse Source 
In the Git for Windows project, we have ample precendent for config
settings that apply to Windows, and to Windows only.

Let's formalize this concept by introducing a platform_core_config()
function that can be #define'd in a platform-specific manner.

This will allow us to contain platform-specific code better, as the
corresponding variables no longer need to be exported so that they can
be defined in environment.c and be set in config.c

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-10-30 11:40:04 -07:00 committed by Junio C Hamano
parent 409670f34e
commit 70fc5793df
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compat/mingw.c
View File

@ -203,6 +203,11 @@ static int ask_yes_no_if_possible(const char *format, ...)
} }
} }
int mingw_core_config(const char *var, const char *value, void *cb)
{
return 0;
}
/* Normalizes NT paths as returned by some low-level APIs. */ /* Normalizes NT paths as returned by some low-level APIs. */
static wchar_t *normalize_ntpath(wchar_t *wbuf) static wchar_t *normalize_ntpath(wchar_t *wbuf)
{ {

3
compat/mingw.h
View File

@ -11,6 +11,9 @@ typedef _sigset_t sigset_t;
#undef _POSIX_THREAD_SAFE_FUNCTIONS #undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif #endif
extern int mingw_core_config(const char *var, const char *value, void *cb);
#define platform_core_config mingw_core_config
/* /*
* things that are not available in header files * things that are not available in header files
*/ */

6
config.c
View File

@ -1093,7 +1093,7 @@ int git_config_color(char *dest, const char *var, const char *value)
return 0; 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 */ /* This needs a better name */
if (!strcmp(var, "core.filemode")) { if (!strcmp(var, "core.filemode")) {
@ -1363,7 +1363,7 @@ static int git_default_core_config(const char *var, const char *value)
} }
/* Add other config variables here and to Documentation/config.txt. */ /* Add other config variables here and to Documentation/config.txt. */
return 0; return platform_core_config(var, value, cb);
} }
static int git_default_i18n_config(const char *var, const char *value) static int git_default_i18n_config(const char *var, const char *value)
@ -1451,7 +1451,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) int git_default_config(const char *var, const char *value, void *cb)
{ {
if (starts_with(var, "core.")) 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.")) if (starts_with(var, "user."))
return git_ident_config(var, value, cb); return git_ident_config(var, value, cb);

8
git-compat-util.h
View File

@ -342,6 +342,14 @@ typedef uintmax_t timestamp_t;
#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin" #define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
#endif #endif
#ifndef platform_core_config
static inline int noop_core_config(const char *var, const char *value, void *cb)
{
return 0;
}
#define platform_core_config noop_core_config
#endif
#ifndef has_dos_drive_prefix #ifndef has_dos_drive_prefix
static inline int git_has_dos_drive_prefix(const char *path) static inline int git_has_dos_drive_prefix(const char *path)
{ {