mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'jc/core-checkstat'
The configuration variable core.checkstat was advertised in the documentation but the code expected core.statinfo instead. For now, we accept both core.checkstat and core.statinfo, but the latter will be removed in the longer term. * jc/core-checkstat: deprecate core.statinfo at Git 2.0 boundary
This commit is contained in:
commit
446913e5db
15
config.c
15
config.c
|
@ -566,7 +566,20 @@ static int git_default_core_config(const char *var, const char *value)
|
|||
trust_ctime = git_config_bool(var, value);
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(var, "core.statinfo")) {
|
||||
if (!strcmp(var, "core.statinfo") ||
|
||||
!strcmp(var, "core.checkstat")) {
|
||||
/*
|
||||
* NEEDSWORK: statinfo was a typo in v1.8.2 that has
|
||||
* never been advertised. we will remove it at Git
|
||||
* 2.0 boundary.
|
||||
*/
|
||||
if (!strcmp(var, "core.statinfo")) {
|
||||
static int warned;
|
||||
if (!warned++) {
|
||||
warning("'core.statinfo' will be removed in Git 2.0; "
|
||||
"use 'core.checkstat' instead.");
|
||||
}
|
||||
}
|
||||
if (!strcasecmp(value, "default"))
|
||||
check_stat = 1;
|
||||
else if (!strcasecmp(value, "minimal"))
|
||||
|
|
Loading…
Reference in a new issue