summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-01-15 23:20:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-15 23:20:28 (GMT)
commit6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9 (patch)
tree41a8db8c59a11dbe2996c3188a0a740e4020b7bc /t
parent72c4083ddf91b489b7b7b812df67ee8842177d98 (diff)
parenta9ecaa06a7235e62a9cf4703a19463fcee4449c7 (diff)
downloadgit-6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9.zip
git-6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9.tar.gz
git-6dbbae17d9d1f35e7b46d04ba69e453e0a384ac9.tar.bz2
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
Diffstat (limited to 't')
-rwxr-xr-xt/t3200-branch.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 3ec3e1d..0af3b85 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?