Merge branch 'lt/default-abbrev' into maint

[thirdparty/git.git] / config.c

diff --git a/config.c b/config.c
index fa740a6a60a49512b613f70add97d445f622afd2..749e5afc45ee17e840f0983f7c814a2c2efd6340 100644 (file)
--- a/config.c
+++ b/config.c
@@ -523,6 +523,14 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.abbrev")) {
+               int abbrev = git_config_int(var, value);
+               if (abbrev < minimum_abbrev || abbrev > 40)
+                       return -1;
+               default_abbrev = abbrev;
+               return 0;
+       }
+
        if (!strcmp(var, "core.loosecompression")) {
                int level = git_config_int(var, value);
                if (level == -1)