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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/describe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 3ba26dc81..4afd1504a 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -21,7 +21,7 @@ static int debug; /* Display lots of verbose info */ static int all; /* Any valid ref can be used */ static int tags; /* Allow lightweight tags */ static int longformat; -static int abbrev = DEFAULT_ABBREV; +static int abbrev = -1; /* unspecified */ static int max_candidates = 10; static struct hash_table names; static int have_util; @@ -420,7 +420,11 @@ int cmd_describe(int argc, const char **argv, const char *prefix) OPT_END(), }; + git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, options, describe_usage, 0); + if (abbrev < 0) + abbrev = DEFAULT_ABBREV; + if (max_candidates < 0) max_candidates = 0; else if (max_candidates > MAX_TAGS) |