aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 15:16:22 -0800
committerJunio C Hamano <gitster@pobox.com>2014-03-07 15:16:23 -0800
commit2b4a888069b65ab7a6b6291a15ee044705222334 (patch)
tree7493049280a8329d2e058cdc7bdb6209ef49caa0 /config.c
parent160c4b183c6fe87417e1beb9a97949567bb3988a (diff)
parentc1b5d738bf9228db56f64149f96961b3aaf529a9 (diff)
downloadgit-2b4a888069b65ab7a6b6291a15ee044705222334.tar.gz
git-2b4a888069b65ab7a6b6291a15ee044705222334.tar.xz
Merge branch 'jc/core-checkstat-2.0'
"core.statinfo" configuration variable, which was a never-advertised synonym to "core.checkstat", has been removed.
Diffstat (limited to 'config.c')
-rw-r--r--config.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/config.c b/config.c
index 314d8ee74..7f5b800ff 100644
--- a/config.c
+++ b/config.c
@@ -667,20 +667,7 @@ 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") ||
- !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 (!strcmp(var, "core.checkstat")) {
if (!strcasecmp(value, "default"))
check_stat = 1;
else if (!strcasecmp(value, "minimal"))