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 /cache.h | |
| 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 'cache.h')
| -rw-r--r-- | cache.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -540,6 +540,7 @@ extern int trust_executable_bit; extern int trust_ctime; extern int quote_path_fully; extern int has_symlinks; +extern int minimum_abbrev, default_abbrev; extern int ignore_case; extern int assume_unchanged; extern int prefer_symlink_refs; @@ -759,8 +760,8 @@ static inline unsigned int hexval(unsigned char c) } /* Convert to/from hex/sha1 representation */ -#define MINIMUM_ABBREV 4 -#define DEFAULT_ABBREV 7 +#define MINIMUM_ABBREV minimum_abbrev +#define DEFAULT_ABBREV default_abbrev struct object_context { unsigned char tree[20]; |