diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-11 18:04:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-11 18:04:11 -0700 |
| commit | e0ad9574ddf5bb14d9ed6808112485ce0da99fea (patch) | |
| tree | 633eb1867a929588ec5b3d8af351a93ba62aac5a /t/test-lib.sh | |
| parent | 4f0a8be78499454eac3985b6e7e144b8376ab0a5 (diff) | |
| parent | e023ff0691ca207d421a0e75ea23c132ada9142a (diff) | |
| download | git-e0ad9574ddf5bb14d9ed6808112485ce0da99fea.tar.gz | |
Merge branch 'bc/sha-256-part-3'
The final leg of SHA-256 transition.
* bc/sha-256-part-3: (39 commits)
t: remove test_oid_init in tests
docs: add documentation for extensions.objectFormat
ci: run tests with SHA-256
t: make SHA1 prerequisite depend on default hash
t: allow testing different hash algorithms via environment
t: add test_oid option to select hash algorithm
repository: enable SHA-256 support by default
setup: add support for reading extensions.objectformat
bundle: add new version for use with SHA-256
builtin/verify-pack: implement an --object-format option
http-fetch: set up git directory before parsing pack hashes
t0410: mark test with SHA1 prerequisite
t5308: make test work with SHA-256
t9700: make hash size independent
t9500: ensure that algorithm info is preserved in config
t9350: make hash size independent
t9301: make hash size independent
t9300: use $ZERO_OID instead of hard-coded object ID
t9300: abstract away SHA-1-specific constants
t8011: make hash size independent
...
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index ba224c86f5..ef31f40037 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -455,6 +455,9 @@ export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME export GIT_COMMITTER_DATE GIT_AUTHOR_DATE export EDITOR +GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}" +export GIT_DEFAULT_HASH + # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output GIT_TRACE_BARE=1 export GIT_TRACE_BARE @@ -1689,7 +1692,11 @@ test_lazy_prereq CURL ' # which will not work with other hash algorithms and tests that work but don't # test anything meaningful (e.g. special values which cause short collisions). test_lazy_prereq SHA1 ' - test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 + case "$GIT_DEFAULT_HASH" in + sha1) true ;; + "") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;; + *) false ;; + esac ' test_lazy_prereq REBASE_P ' |