diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
commit | be57695d77c4303798796510585618c57e1bba63 (patch) | |
tree | 820d05e7347393aeed8365e37cb62ec4ada5836d /config.c | |
parent | 3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (diff) | |
parent | a71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff) | |
download | git-be57695d77c4303798796510585618c57e1bba63.tar.gz git-be57695d77c4303798796510585618c57e1bba63.tar.xz |
Merge branch 'lt/default-abbrev' into maint
* lt/default-abbrev:
Rename core.abbrevlength back to core.abbrev
Make the default abbrev length configurable
Diffstat (limited to 'config.c')
-rw-r--r-- | config.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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) |