Merge branch 'jc/core-checkstat' into maint
* jc/core-checkstat: deprecate core.statinfo at Git 2.0 boundary
This commit is contained in:
commit
8dbc03933d
13
config.c
13
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);
|
trust_ctime = git_config_bool(var, value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
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")) {
|
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"))
|
if (!strcasecmp(value, "default"))
|
||||||
check_stat = 1;
|
check_stat = 1;
|
||||||
else if (!strcasecmp(value, "minimal"))
|
else if (!strcasecmp(value, "minimal"))
|
||||||
|
Loading…
Reference in New Issue
Block a user