diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-23 14:55:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-23 14:55:40 -0700 |
| commit | da2584243e4308f10adeb45e95fb090c0110fe4f (patch) | |
| tree | 0c32caa2ad160cee9703a5481536d037179e60f1 /cache.h | |
| parent | 6fe519a91cc7131931ca50fedcdeb8e41453c892 (diff) | |
| parent | a71f09fe3e8b047d88b5f439c6d552e8fc7e8293 (diff) | |
| download | git-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.gz git-da2584243e4308f10adeb45e95fb090c0110fe4f.tar.xz | |
Merge branch 'lt/default-abbrev'
* 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
@@ -556,6 +556,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; @@ -775,8 +776,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]; |