From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:39:15 +0000 (-0700)
Subject: Merge branch 'jc/core-checkstat' into maint
X-Git-Tag: v1.8.3.3~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8dbc03933d0832764fe80576d249d5b9d3b52f20?hp=0bdae5ff7dd4aca3532d9b0336532c23eb2c44ab

Merge branch 'jc/core-checkstat' into maint

* jc/core-checkstat:
deprecate core.statinfo at Git 2.0 boundary
---

diff --git a/config.c b/config.c
index 830ee14b43..7a85ebdbae 100644
--- a/config.c
+++ b/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"))