summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-11 06:45:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-11 06:45:49 (GMT)
commitadfe4e1ff2c296184856bf55636be845f96b55e5 (patch)
treeca672bed6ea60d2b3fdc9454f75b03e52472063c /config.c
parent83c3c6222a2331042c973a991572eafa37f25d1d (diff)
parentea2c69ed4728070be1d2ee953a6948398b859150 (diff)
downloadgit-adfe4e1ff2c296184856bf55636be845f96b55e5.zip
git-adfe4e1ff2c296184856bf55636be845f96b55e5.tar.gz
git-adfe4e1ff2c296184856bf55636be845f96b55e5.tar.bz2
Merge branch 'maint'
* maint: Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
Diffstat (limited to 'config.c')
-rw-r--r--config.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/config.c b/config.c
index 31f778b..b94de8f 100644
--- a/config.c
+++ b/config.c
@@ -499,13 +499,6 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
- if (!strcmp(var, "core.abbrevguard")) {
- unique_abbrev_extra_length = git_config_int(var, value);
- if (unique_abbrev_extra_length < 0)
- unique_abbrev_extra_length = 0;
- return 0;
- }
-
if (!strcmp(var, "core.bare")) {
is_bare_repository_cfg = git_config_bool(var, value);
return 0;