зеркало из https://github.com/microsoft/git.git
Merge branch 'ew/decline-core-abbrev'
The configuration variable 'core.abbrev' can be set to 'no' to force no abbreviation regardless of the hash algorithm. * ew/decline-core-abbrev: core.abbrev=no disables abbreviations
This commit is contained in:
Коммит
6dbbae17d9
|
@ -625,4 +625,6 @@ core.abbrev::
|
|||
computed based on the approximate number of packed objects
|
||||
in your repository, which hopefully is enough for
|
||||
abbreviated object names to stay unique for some time.
|
||||
If set to "no", no abbreviation is made and the object names
|
||||
are shown in their full length.
|
||||
The minimum length is 4.
|
||||
|
|
2
config.c
2
config.c
|
@ -1217,6 +1217,8 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
|
|||
return config_error_nonbool(var);
|
||||
if (!strcasecmp(value, "auto"))
|
||||
default_abbrev = -1;
|
||||
else if (!git_parse_maybe_bool_text(value))
|
||||
default_abbrev = the_hash_algo->hexsz;
|
||||
else {
|
||||
int abbrev = git_config_int(var, value);
|
||||
if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz)
|
||||
|
|
|
@ -306,7 +306,9 @@ test_expect_success 'git branch --list -v with --abbrev' '
|
|||
|
||||
git branch -v --list --no-abbrev t >actual.noabbrev &&
|
||||
git branch -v --list --abbrev=0 t >actual.0abbrev &&
|
||||
git -c core.abbrev=no branch -v --list t >actual.noabbrev-conf &&
|
||||
test_cmp actual.noabbrev actual.0abbrev &&
|
||||
test_cmp actual.noabbrev actual.noabbrev-conf &&
|
||||
|
||||
git branch -v --list --abbrev=36 t >actual.36abbrev &&
|
||||
# how many hexdigits are used?
|
||||
|
|
Загрузка…
Ссылка в новой задаче