mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 07:06:12 +02:00
Code

Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" 

This reverts commit 72a5b561fc, as adding
fixed number of hexdigits more than necessary to make one object name
locally unique does not help in futureproofing the uniqueness of names
we generate today.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-03-10 22:41:14 -08:00
parent 681186ae3a
commit ea2c69ed47
5 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/config.txt
View File

@ -376,15 +376,6 @@ core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
and might match multiple refs in the .git/refs/ tree. True by default.
core.abbrevguard::
Even though git makes sure that it uses enough hexdigits to show
an abbreviated object name unambiguously, as more objects are
added to the repository over time, a short name that used to be
unique will stop being unique. Git uses this many extra hexdigits
that are more than necessary to make the object name currently
unique, in the hope that its output will stay unique a bit longer.
Defaults to 0.
core.compression::
An integer -1..9, indicating a default compression level.
-1 is the zlib default. 0 means no compression,

1
cache.h
View File

@ -545,7 +545,6 @@ extern int assume_unchanged;
extern int prefer_symlink_refs;
extern int log_all_ref_updates;
extern int warn_ambiguous_refs;
extern int unique_abbrev_extra_length;
extern int shared_repository;
extern const char *apply_default_whitespace;
extern const char *apply_default_ignorewhitespace;

7
config.c
View File

@ -499,13 +499,6 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
if (!strcmp(var, "core.abbrevguard")) {
unique_abbrev_extra_length = git_config_int(var, value);
if (unique_abbrev_extra_length < 0)
unique_abbrev_extra_length = 0;
return 0;
}
if (!strcmp(var, "core.bare")) {
is_bare_repository_cfg = git_config_bool(var, value);
return 0;

1
environment.c
View File

@ -21,7 +21,6 @@ int prefer_symlink_refs;
int is_bare_repository_cfg = -1; /* unspecified */
int log_all_ref_updates = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int unique_abbrev_extra_length;
int repository_format_version;
const char *git_commit_encoding;
const char *git_log_output_encoding;

4
sha1_name.c
View File

@ -208,9 +208,7 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
if (exists
? !status
: status == SHORT_NAME_NOT_FOUND) {
int cut_at = len + unique_abbrev_extra_length;
cut_at = (cut_at < 40) ? cut_at : 40;
hex[cut_at] = 0;
hex[len] = 0;
return hex;
}
len++;