From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 05:26:24 +0000 (-0700)
Subject: Rename core.abbrevlength back to core.abbrev
X-Git-Tag: v1.7.5-rc0~31^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a71f09fe3e8b047d88b5f439c6d552e8fc7e8293;p=git.git

Rename core.abbrevlength back to core.abbrev

It corresponds to --abbrev=$n command line option after all.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 30afde98a..dacbcdeb7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -567,7 +567,7 @@ core.sparseCheckout::
 	Enable "sparse checkout" feature. See section "Sparse checkout" in
 	linkgit:git-read-tree[1] for more information.
 
-core.abbrevLength::
+core.abbrev::
 	Set the length object names are abbreviated to.  If unspecified,
 	many commands abbreviate to 7 hexdigits, which may not be enough
 	for abbreviated object names to stay unique for sufficiently long
diff --git a/config.c b/config.c
index e8a6e5679..79e6c1896 100644
--- a/config.c
+++ b/config.c
@@ -531,7 +531,7 @@ static int git_default_core_config(const char *var, const char *value)
 		return 0;
 	}
 
-	if (!strcmp(var, "core.abbrevlength")) {
+	if (!strcmp(var, "core.abbrev")) {
 		int abbrev = git_config_int(var, value);
 		if (abbrev < minimum_abbrev || abbrev > 40)
 			return -1;