diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:28 -0800 |
| commit | 6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9 (patch) | |
| tree | 41a8db8c59a11dbe2996c3188a0a740e4020b7bc | |
| parent | 72c4083ddf91b489b7b7b812df67ee8842177d98 (diff) | |
| parent | a9ecaa06a7235e62a9cf4703a19463fcee4449c7 (diff) | |
| download | git-6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9.tar.gz | |
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
| -rw-r--r-- | Documentation/config/core.txt | 2 | ||||
| -rw-r--r-- | config.c | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt index 160aacad84..c04f62a54a 100644 --- a/Documentation/config/core.txt +++ b/Documentation/config/core.txt @@ -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. @@ -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) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 3ec3e1d730..0af3b85d17 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -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? |