diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-30 17:19:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 12:54:21 -0700 |
commit | 65acfeacaa6e50c92a6ac18dc08356026a99b3f3 (patch) | |
tree | a1eb64ce36df89ece856f034cf817a4c27b39efa /environment.c | |
parent | 5b33cb1fd733f581da07ae8afa7e9547eafd248e (diff) | |
download | git-65acfeacaa6e50c92a6ac18dc08356026a99b3f3.tar.gz |
abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing
We'll be introducing a new way to decide the default abbreviation
length by initialising DEFAULT_ABBREV to -1 to signal the first call
to "find unique abbreviation" codepath to compute a reasonable value
based on the number of objects we have to avoid collisions.
We have long relied on DEFAULT_ABBREV being a positive concrete
value that is used as the abbreviation length when no extra
configuration or command line option has overridden it. Some
codepaths wants to use such a positive concrete default value
even before making their first request to actually trigger the
computation for the auto sized default.
Introduce FALLBACK_DEFAULT_ABBREV and use it to the code that
attempts to align the report from "git fetch". For now, this
macro is also used to initialize the default_abbrev variable,
but the auto-sizing code will use -1 and then use the value of
FALLBACK_DEFAULT_ABBREV as the starting point of auto-sizing.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'environment.c')
-rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index cd5aa57179..44fb107b8a 100644 --- a/environment.c +++ b/environment.c @@ -16,7 +16,7 @@ int trust_executable_bit = 1; int trust_ctime = 1; int check_stat = 1; int has_symlinks = 1; -int minimum_abbrev = 4, default_abbrev = 7; +int minimum_abbrev = 4, default_abbrev = FALLBACK_DEFAULT_ABBREV; int ignore_case; int assume_unchanged; int prefer_symlink_refs; |